Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 25 Aug 2012 14:43:37 +0000 (10:43 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 25 Aug 2012 14:43:37 +0000 (10:43 -0400)
commit5fa605beada972eb32ca781ee420cc69e1732e20
treea9295da319d5909c8f5d39fc37a743760a578ae4
parenta3c1768e109f5f125ca3b9f4e8e2adbd4c2e5abc
parent45c31be7dbf81517e854304237bb95d53657b27d
Merge branch 'master' of ssh://git.ikiwiki.info