Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 30 Nov 2011 20:49:18 +0000 (16:49 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 30 Nov 2011 20:49:18 +0000 (16:49 -0400)
commitf55931dd769c732cc50d4ca7df9293a28574bee0
treeb6c60fbe2e8cbd0cc2cbda2191a843b2d2707f30
parentd13e86a6cb9a9aef843a780dadffc9dab7de0ab4
parent08615fd3e8cc61111186796e08466ba4d062c301
Merge branch 'master' of ssh://git.ikiwiki.info