Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 17 Feb 2009 18:10:35 +0000 (13:10 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 17 Feb 2009 18:10:35 +0000 (13:10 -0500)
commit532bf02e0681f32c2f115adf8c3347f818ffd54e
treebc7c596e4045e386702e83c8a972288ff62f6f0c
parent0b2e755253e2b20993e50b19a206597a3ff88e2d
parent64000366bde6dbd3a329e4665b0712ceac0993ac
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info