Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 26 Jul 2011 15:30:17 +0000 (17:30 +0200)
committerJoey Hess <joey@kitenet.net>
Tue, 26 Jul 2011 15:30:17 +0000 (17:30 +0200)
commitf8421938fbf0806eb95dafa58fc0ba97a9216301
treeda0e5236c0930fce2a307238fa21be01135a3c13
parent2555257ade5c26bea93e0a6c45764f58cfcbf149
parent25dc43276702b7edeec27493dce976fdab5869ec
Merge branch 'master' of ssh://git.ikiwiki.info