Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 3 Jan 2010 19:12:39 +0000 (14:12 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 3 Jan 2010 19:12:39 +0000 (14:12 -0500)
commit2ffa1a31ba0c3009ee5e1c158ba6b455d4cc7e9c
tree51f36105b4ea0484fa0c21f2d437edf66d332645
parenta27fad48d45084421a74fc6d24ffc061cc6c66ca
parent9af117325a10738daa553a30c1d33fac7d115ab4
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info