Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 18 May 2009 19:32:11 +0000 (15:32 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 18 May 2009 19:32:11 +0000 (15:32 -0400)
commitd20030b62ac5c01cdbd793d3591398c0a1768373
treebce63c1a9006686bc4c21a34fac15bdbc244ed3f
parent4f4666c4ae5cdf5e04ac42cc52a97d90e978adb0
parent8f1d02decf81f9f3d1214516927a134339dc6eeb
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info