Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 18 May 2009 19:49:15 +0000 (15:49 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 18 May 2009 19:49:15 +0000 (15:49 -0400)
commit300a4c548ccd2868d216f36d6180d93d86492148
treef3f920c712d260845053e13340a4f574b3791ef4
parentf52fed88b82f585ad3a45c73cb0e567da69481d8
parent68eb9de5015d23418dc9ad6bbc92ea4a58a59eba
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info