Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 14 Jan 2014 18:52:50 +0000 (14:52 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 14 Jan 2014 18:52:50 +0000 (14:52 -0400)
commit4c3a2a135766ea18ffd24b4ae956dc0dc4a27380
tree2acb20bd44c3c7e3b6a730371e37d6f97855d3a5
parentfe1a69e11a16b337338593b784b48a4783de5cec
parentaa0dff216d80442a891fcaed362e813db6cac8db
Merge branch 'master' of ssh://git.ikiwiki.info