Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 22 May 2012 19:21:17 +0000 (15:21 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 22 May 2012 19:21:17 +0000 (15:21 -0400)
commit7f8706dfdb35e28bf81857dba01541c2958f62a6
tree1bc341aba47e5b4309d6f23d7a802065962749a2
parent29b00c0f9b85cc7ac5cbbe17927639008dc9e1e4
parentbca705fb688d6965408e68e3f37e087945b9462d
Merge branch 'master' of ssh://git.ikiwiki.info