Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 2 Oct 2013 17:26:42 +0000 (13:26 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 2 Oct 2013 17:26:42 +0000 (13:26 -0400)
commit1b64f369e3edc1b4e185c33380a8bbf88a41715a
tree33e550a04b64da16710b91842715479c2baa5149
parent7878e6d2b80c1fd283839ea3aa0c3ca3fbe01e04
parentd481a35aecd04721d1e5b0d90ee8791241be26cf
Merge branch 'master' of ssh://git.ikiwiki.info