Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Apr 2010 03:05:04 +0000 (23:05 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Apr 2010 03:05:04 +0000 (23:05 -0400)
commit9dc220711dff12fd45274c4e2fd2645a33d3de5c
tree1c5ab1f85a445639daa599d98732c960db9aab6a
parentfcd810d236fdf779beb740082953a14feba07f0d
parente12cd5f293fea9d85c7e4cdc86e2bf9381d5676a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info