Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 20 Dec 2012 19:28:28 +0000 (15:28 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 20 Dec 2012 19:28:28 +0000 (15:28 -0400)
commit4f274e04544d5cb25f693e3590d32e181a13ea9e
tree37c6e068c0f7493b57233c8c191d0f769f72908a
parent12c9219d671c672fedcf9e9ab7f9187b23b8f7f4
parent130fd91a6926990ba8fc3a132a81e55c61d16270
Merge branch 'master' of ssh://git.ikiwiki.info