Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 21 Dec 2012 18:47:46 +0000 (14:47 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 21 Dec 2012 18:47:46 +0000 (14:47 -0400)
commitc357692b3407278056204c0931b596fd212305d0
tree34cbaa856905929424436b25a4fda664499479bd
parent23791480f00d7f3faf3531b861b41a5471677451
parentbae3d0d01fb914ba046da4df3c498f44e41ef750
Merge branch 'master' of ssh://git.ikiwiki.info