Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 6 Aug 2011 16:31:23 +0000 (12:31 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 6 Aug 2011 16:31:23 +0000 (12:31 -0400)
commit556d2100e7a5d2fd594bdb12e717b628e909d11a
tree3f58749ea14645af3f704fe5cf7a67d981d0e4b3
parente07adcad7a22772f33a03296b96b75c13b1d1554
parentc7d6dba6db3247f088d64694f4c2f310e1701219
Merge branch 'master' of ssh://git.ikiwiki.info