Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 5 Sep 2008 16:37:57 +0000 (12:37 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 5 Sep 2008 16:37:57 +0000 (12:37 -0400)
commitf9618417753fc680eaaa6b42b8555e625103a619
tree74e039b40b6a2f43af1a29547fb779989bb982d7
parenta1c7f3282d4f7b67f2103c341904d29e73359995
parent660fde2caa368ba07468837a3a5543353a41232c
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info