Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 28 Mar 2013 17:30:00 +0000 (13:30 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 28 Mar 2013 17:30:00 +0000 (13:30 -0400)
commit2e05867a2f8d404a4f66dcdac10f838d05a748ef
treef4c2533ac7aceb98441d921fdb1effe035d6c876
parentab352678500156a9444a5815d65956af0aba7e4f
parentf1df82a0e0fa444dfa14654bc19e85ee4109ce77
Merge branch 'master' of ssh://git.ikiwiki.info