Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 26 Apr 2012 16:54:55 +0000 (12:54 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 26 Apr 2012 16:54:55 +0000 (12:54 -0400)
commita29599d68aec2797eb6b3b48c8a151025a4d6fa4
treedd7b585b7a0af66baee35e7483b13c2a82489670
parentd6fc24d10e030f4ff03e064364e0a8959f5efb46
parent75edc3c2233461ad371710c05497e6c7e1e79a46
Merge branch 'master' of ssh://git.ikiwiki.info