Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 10 Sep 2009 20:17:58 +0000 (16:17 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 10 Sep 2009 20:17:58 +0000 (16:17 -0400)
commit59c88c255438fabe50115fbfa3adf1327579170d
treef4f6f2a288750a3deb9a53dc819292d445e00080
parent26dae8f04955915f4203fab4bd5301c959f7771a
parentfa2486c5648e751d561244faec38d261cbd01b36
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info