Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 19 Jul 2012 17:48:56 +0000 (13:48 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 19 Jul 2012 17:48:56 +0000 (13:48 -0400)
commit56de5b2d89e38309c9152a0e98a3c65453c8009e
treef7e461b168bf3d3edb83aa8fe2872398626b19ce
parent9cab856ed70b566292982796187c0c1d71e9d433
parent9fb6451ef94db59442c5b3867516baecdfcee01d
Merge branch 'master' of ssh://git.ikiwiki.info