Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 10 Jul 2013 21:08:02 +0000 (17:08 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 10 Jul 2013 21:08:02 +0000 (17:08 -0400)
commitd932d5ab00885a9f7bab7644d75a38ad9a4dc48b
treee8d780c0925b3ec4d31a3f8f77afe20276517409
parentacb07ef4164643ac0dac28aab2ceae24510e5641
parentc870043c97b6daa138df4d763d872c94a41e9d20
Merge branch 'master' of ssh://git.ikiwiki.info