Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 15 Oct 2009 18:26:22 +0000 (14:26 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 15 Oct 2009 18:26:22 +0000 (14:26 -0400)
commit8d26a4267568451de286a9e6a4a73edf8e99e084
treea3ba83341362dc77609246c3cea02f362771fe72
parent96729cafc3c178b54da271c9ba5cbb51a69cccab
parent3d268733a31fb3e8a27745a37ac12bf422acb3d8
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info