]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 5 Aug 2010 21:39:47 +0000 (17:39 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 5 Aug 2010 21:39:47 +0000 (17:39 -0400)
commitaac249cca3cb2b33a695da4a22fe5422776081be
treed9b347722a07e0024ad103b4c216f59fbbb12530
parent86dc710d9047faa87cc38b2f8e44f6ff9cc457a6
parent69297da448452050823dd27ccb9c1a7d4b2dfe27
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info