Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 9 Aug 2008 15:54:12 +0000 (11:54 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 9 Aug 2008 15:54:12 +0000 (11:54 -0400)
commit5867c415eee1500f02ccd244c802c9c10a1dfbc2
treea0877d2b68c1c1c5780335a77762ac06bc374445
parent5afeca81546796673531d6e25fa1c84ab6da9733
parentd3eb0075d300bcfd504dc878e63761dbbc5171be
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info