Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 15 Oct 2012 17:54:22 +0000 (13:54 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 15 Oct 2012 17:54:22 +0000 (13:54 -0400)
commitc6c7e1998669f4979a2f12bbdd6d74775d5946d2
treeff4cb11f7dcece594a86a24d3ffbce17604dc6fb
parentbad3c0089a7fcb1bb72784908b2c095282db1c01
parent7a89e8c23145591298371f9711f7010243434b56
Merge branch 'master' of ssh://git.ikiwiki.info