Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 2 Jan 2014 16:04:22 +0000 (12:04 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 2 Jan 2014 16:04:22 +0000 (12:04 -0400)
commit9273bc5185d9633739c96570402a2c050f3fa7e2
tree3a19faf7dc8a6e7465a837a764e73e5c03d40b72
parent7159e7ea9039d2e3227c5e0f8d22e89df672b5e3
parentda5afbfbc0b7b90c6cc02d00dff583bf813fd4aa
Merge branch 'master' of ssh://git.ikiwiki.info