Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 30 Apr 2011 16:06:41 +0000 (12:06 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 30 Apr 2011 16:06:41 +0000 (12:06 -0400)
commit272961d7ff952ba1e1c593c74e6b2b805fa53e77
tree58a3271759f7102994cc7df36814239297280dc1
parente258575c12be1594be8d4740ec3ba84bfe7f96a6
parent96cb4308d9b5bf9f92f1ff63e6ba30e8f9a590be
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info