Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 28 Oct 2010 19:38:24 +0000 (15:38 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 28 Oct 2010 19:38:24 +0000 (15:38 -0400)
commitea48e1c038bfdab5820383cb885360c1d3fe2a14
tree5f174623db9897c5f0079f478cab4276971e21fc
parentac6b5c12fa9c834555fde4a4cf06db7b792556d4
parent663d2578832dd0808ea98a624b49cec4bf3c0243
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info