Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 18 Sep 2010 16:58:41 +0000 (12:58 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 18 Sep 2010 16:58:41 +0000 (12:58 -0400)
commit4843ec6dd09f4d88fa05ce178abe9cc1fb52b3e7
treee1ce67c690d8ae2e7fcdfe160906d9f716bab216
parent96a8ea0ebbd93a8cc56222234d4a5815b30a3934
parent65c5e24d364f491ace462beb06e2e3adb721b1e0
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info