Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 15 Aug 2008 01:13:19 +0000 (21:13 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 15 Aug 2008 01:13:19 +0000 (21:13 -0400)
commit96f5bdb2d8891810e0011284da706aabecc00349
tree0c4249694a3cc466904d7c68501cde08d5cda9a8
parent0ab3ed872b8052e71263f381bed0147bb20093df
parent79a3fbb1abccdbc2d6b0d3ea8435fb78b06b0cfb
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info