Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 14 Sep 2010 19:13:13 +0000 (15:13 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 14 Sep 2010 19:13:13 +0000 (15:13 -0400)
commitad5f4f14f52233148a9ecae2b3e7e0964c6c02ba
treef7e4c3e832ba7a997c5279f4b5e2750a507a2b2c
parent894d09ba9482dd53448986f487ca0f372083fee4
parent382b0b349988d92f8571b38beb8be003e0b334a0
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info