Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 18 Jun 2010 22:07:40 +0000 (18:07 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 18 Jun 2010 22:07:40 +0000 (18:07 -0400)
commit9b673c2afc815185bad1bc35edaffeff115dd1b3
tree42d1d4e350fb969458003a810e707a3c3b4e2193
parentaa0fe1aac9b393a7a214dedef4229560ab31a5df
parent4833f486b6ca759e1bcd8acc19e13ef4a0a6063f
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info