]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 20:29:36 +0000 (21:29 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 20:29:36 +0000 (21:29 +0100)
commit1fea8bdde17b04f81138587c235423d21a0620e0
tree8a118c9bf44999ae0622093d6f5a31708d4b05fc
parent3699c310adfdfefdae2afa35d33794d324aa4122
parent32b86c5f5b8eef0fdeb2229159787cc3d9206a74
Merge commit 'upstream/master'