Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 26 May 2009 21:05:39 +0000 (17:05 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 26 May 2009 21:05:39 +0000 (17:05 -0400)
commit4b81616c0468956b434207fc7266cb3eb4d1bbfa
treef41259f04fd8746140a8989c936b4662c382ffcb
parent96087cbd88fd056ae34675abfb0e3e411f019763
parentb1695647f63d27103e078a5b546b746973148ef2
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info