Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 28 Oct 2013 19:49:15 +0000 (15:49 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 28 Oct 2013 19:49:15 +0000 (15:49 -0400)
commit0b733575a44a527b54afc75b4c2b87b8bc5872a3
treee75f392bacc4e3e05aa350f6859e779aedeb8f3c
parent970547f7bc72c235a535a583b9cfa26f50e3e36a
parenta23d309c47092c2f9d0a4f7e67bf63547c58504d
Merge branch 'master' of ssh://git.ikiwiki.info