Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 6 Apr 2012 18:32:05 +0000 (14:32 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 6 Apr 2012 18:32:05 +0000 (14:32 -0400)
commit089e72caa7dc9976ab009fabd1dab9eaad0cf4ff
tree0fb1a77a93ceff2ae550deb8282a4ea5eecfa373
parentd722897a6dbdb59237616bd0aa33e7e65f331fb3
parent66fa5826f35aaa2b609bb86f67c3df887bad1e09
Merge branch 'master' of ssh://git.ikiwiki.info