Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 6 Dec 2009 19:53:16 +0000 (14:53 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 6 Dec 2009 19:53:16 +0000 (14:53 -0500)
commit691d7ff82774b376cb76810c6f114fccf4b6e7cf
treea6669d9f195dc000b7c351b7af112a9f7c99f615
parentb8ed5e72286ab0c592ea62a24a0ac160647d612d
parentcb74161218449bc1bc7648782f421ede9b94334b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info