Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 19 Aug 2012 00:56:40 +0000 (17:56 -0700)
committerJoey Hess <joey@kitenet.net>
Sun, 19 Aug 2012 00:56:40 +0000 (17:56 -0700)
commit79414caf54ca1f3c126526595eab2d86616c9821
tree3204308a0e0e5492da3e8f089a0df46ddbb131ed
parentc137ef31026a5de929251f6c5a747df5ac24763d
parentdb0dea38c6923353072efb805d5a07aa31f2b5d9
Merge branch 'master' of ssh://git.ikiwiki.info