Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 22 Sep 2010 21:50:26 +0000 (17:50 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 22 Sep 2010 21:50:26 +0000 (17:50 -0400)
commit95f7b2ffb11d014763f80a1b63450c08e7f5ff05
treea13aa94ba505a5f4b042fb38543e0c697d44d721
parent90bc68589e8c9e0243d563a9616701c946b2d3fd
parenta31d6ab1b9ca061b565d976f754c11b1bef7a325
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info