Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 15 May 2010 02:07:31 +0000 (22:07 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 15 May 2010 02:07:31 +0000 (22:07 -0400)
commit60ed2aa9e45f0652430483398bc39db1d09c6d38
tree0754648ee83fedb2b4b0853b66579651d7f23529
parentc8b34aa31c7d146adf4210c6171dfea2988a7688
parent68b91528dd66c1e29147babc0647647cc0e0a958
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info