Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 19 Oct 2013 15:26:18 +0000 (11:26 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 19 Oct 2013 15:26:18 +0000 (11:26 -0400)
commit970547f7bc72c235a535a583b9cfa26f50e3e36a
treef0dab1b696244791501a64616e6bce78c43695da
parent65b8fba17c444864135f5f19aeb42d928ca0b120
parent211ee24f141b6a20c767b1c192debb65d6bfd757
Merge branch 'master' of ssh://git.ikiwiki.info