Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
commit0e224c76cc7c9a6b9d2f2bc50f592dea91edcb39
authorJoey Hess <joey@kitenet.net>
Wed, 11 May 2011 01:34:44 +0000 (10 21:34 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 11 May 2011 01:34:44 +0000 (10 21:34 -0400)
tree7eda806e24155c2c04aca744be1864da640d9694
parentb2754fa27222e7cbc6ae7616ef80f4c70aa3d7d4
parent480fbcc25f97491e6577955e104566ac2f339ebc
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info