Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 3 Dec 2013 16:45:18 +0000 (12:45 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 3 Dec 2013 16:45:18 +0000 (12:45 -0400)
commit854152c299da91cd9e1c27789c8c3fd57b8fb28e
treece7f6827c16ed8b4e38b1adc0bf737cc8b0de69e
parentb24235c1534ac40eccd196c948a4cce1766b5dd7
parent9a75c8a11e3bfd5c67c51d8f8dba11443dde6d90
Merge branch 'master' of ssh://git.ikiwiki.info