Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 3 Feb 2012 02:43:25 +0000 (22:43 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 3 Feb 2012 02:43:25 +0000 (22:43 -0400)
commit7f591d22d9fbfab836798fe9e5a3dc71b1c5b9f7
tree4e04d5265694b9e0b76b9e3ebf3577308732942f
parent0a9bb3edc2a9819ba87de1b6e57155120b6aba44
parent5468502b9c29c5177fbcf2ac98499531102f9855
Merge branch 'master' of ssh://git.ikiwiki.info