Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 29 Jun 2011 18:43:51 +0000 (14:43 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 29 Jun 2011 18:43:51 +0000 (14:43 -0400)
commit631c0d9e7c3892abb79bcb31b5769390846a07c3
treeb2558b6ae43f25cfd14c2c8b72db5a4761eee076
parentae1857b43cf55a393a507b8434f172cbdb29d5b0
parent0802f92561a8e05da0299e3a1c94bebdd7c8d1e5
Merge branch 'master' of ssh://git.ikiwiki.info