Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 11 Jun 2010 17:54:07 +0000 (13:54 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 11 Jun 2010 17:54:07 +0000 (13:54 -0400)
commit0822b0fc342391bfdb153db2a27792124d7c3f74
tree2e64dfc80672e0de88baad0e8b46976f223df5e2
parent475b4199e1624350b928a002fe83033ee3389b31
parent77a3585e92a947610b1b26cdd7ce499bfefc21f6
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info