Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 30 Aug 2011 15:38:30 +0000 (11:38 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 30 Aug 2011 15:38:30 +0000 (11:38 -0400)
commit2c2c537dd521bbc659f0499af72ca70078d97d50
tree3e6d42fed91f993fd2ecffb747ff8a2c42d687a9
parent4af7b2c14d548beaf09f100e7fc6efc39e9c73a2
parent2e1fa14a737312d852fd33d7c8518da01695c7da
Merge branch 'master' of ssh://git.ikiwiki.info