Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 18 Oct 2008 16:48:10 +0000 (12:48 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 18 Oct 2008 16:48:10 +0000 (12:48 -0400)
commit6d8df8c1149cfb202cc11ed77f0013b6dced81ba
tree5a16330f43077fc6c0f745d97d8d1b240f11462c
parent18806fa6b0f2afab703d558a499da8918214a1c7
parent943a4ff520d42b41af466e5626b96ee0e2ac13c5
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info