Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 25 Jan 2011 19:01:02 +0000 (15:01 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 25 Jan 2011 19:01:02 +0000 (15:01 -0400)
commit313b06878c2e330848b4db6e12921366d93706c2
tree920cb63779984cd9ca80d459664cd9a64fc9b444
parent5ab5a28cec4feeddb2f8afc10d800b0000fabced
parente594dab011e9995eed009b76a6c9d24b29cfff79
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info