Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 20 Jul 2012 16:57:37 +0000 (12:57 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 20 Jul 2012 16:57:37 +0000 (12:57 -0400)
commit7ec00df985f77eb7ebfe1640be67e1384fa98aa5
tree719215da7bcbd544a98cdd0a640f618262b2c551
parent25ea99bc223346607d91b6aa09b1b49bce220518
parent1fe773e7bc7d665b748e4d6274e0af238d849ef7
Merge branch 'master' of ssh://git.ikiwiki.info