Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 4 Jun 2013 21:19:58 +0000 (17:19 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 4 Jun 2013 21:19:58 +0000 (17:19 -0400)
commit256dee00f9de872e52247ecad976edd97d70c5c8
tree012f6b0f46218dec0bbad036f8a4f5bcc9e3002e
parentadc3c5e7bcccbaa286d7da8dbdbcde035ba4adc0
parentd2856920ec164fb16b7bfac794f27db01a3392de
Merge branch 'master' of ssh://git.ikiwiki.info