Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 21:52:44 +0000 (17:52 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 21:52:44 +0000 (17:52 -0400)
commit9fc13ab196f9ac9852962365d3330020d6720b0b
tree5841e52697086960e179772ca3e1e276335a9f05
parentd578f3ff78190f816c74f6935e1e0024b25dc090
parent4b4fdc85abba7200eed78eb473341e44fecc6087
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info