Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 4 Nov 2013 17:01:22 +0000 (13:01 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 4 Nov 2013 17:01:22 +0000 (13:01 -0400)
commit63cc1f5aab0130bdcc6c8ac3485540d78bc6aa59
treee7a460fe6dc755369680b2fc15617c648ee465c9
parent0b733575a44a527b54afc75b4c2b87b8bc5872a3
parent0cc3a15d6f3b1246d07a2d7bf8f37b3be423cb53
Merge branch 'master' of ssh://git.ikiwiki.info