Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 29 Jul 2011 10:54:39 +0000 (12:54 +0200)
committerJoey Hess <joey@kitenet.net>
Fri, 29 Jul 2011 10:54:39 +0000 (12:54 +0200)
commitd4128e899528c972262efc043eb89ebb34c068bd
tree5d541c21cbafab28e3e8c1fa1bee9732dd9e9e23
parented360d045a070569cd7bf3f9518c107b1e851cdb
parent039ffc5bafcf3f4bf2ad92d12748b51938df32bb
Merge branch 'master' of ssh://git.ikiwiki.info