Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 26 Jul 2011 15:47:39 +0000 (17:47 +0200)
committerJoey Hess <joey@kitenet.net>
Tue, 26 Jul 2011 15:47:39 +0000 (17:47 +0200)
commitfe0cdbef6c51d70e369ff1911e47a6fc883ca9eb
tree879e4e822ab698ad945ac161108d4e7c24e93ee4
parentf8421938fbf0806eb95dafa58fc0ba97a9216301
parent6f9b3d1ae79654a18f3d7663ce0eb90160f48146
Merge branch 'master' of ssh://git.ikiwiki.info