]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 30 Aug 2012 16:03:32 +0000 (12:03 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 30 Aug 2012 16:03:32 +0000 (12:03 -0400)
commit3661370af029a5391a1d7081ed70d83f5ad06c44
treec92735559d6c4a5b792fbaabea3d628661642bf0
parent6064164501ff6a7a7684196b1ec1f7f96a2d4289
parent4eb97eea7a698a087acde3c695d632fa7d43cef2
Merge branch 'master' of ssh://git.ikiwiki.info