Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 15 Dec 2011 18:05:07 +0000 (14:05 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 15 Dec 2011 18:05:07 +0000 (14:05 -0400)
commit95ea0d7e54e84f01aa8d1cb590769ff8d806f987
tree4679ebe919e06b38ff0d17cffeb7804ed8aa2c77
parentfbedf85587d632976071788dec9de374494480fb
parentcdce61c48317980cd2c3a08b93512156caaca289
Merge branch 'master' of ssh://git.ikiwiki.info