Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 3 Nov 2011 17:06:09 +0000 (13:06 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 3 Nov 2011 17:06:09 +0000 (13:06 -0400)
commit7cdbc9642f6576fd3f20aff45843890202291843
treed1e29f1b6bd2fddf9959fc0e9054bf93ab9c5d22
parent573ee4118633bb11b389f1bcff48ce405d6f897e
parent050a4f7669d614280d92764d0948585982718069
Merge branch 'master' of ssh://git.ikiwiki.info