Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 4 Oct 2010 21:03:21 +0000 (17:03 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 4 Oct 2010 21:03:21 +0000 (17:03 -0400)
commit082649f8698c5ca71aad504384f6aa4724420a8e
treef3bf3e7369eeccef7f780d19a7a2c405b9e38dbd
parenta99790e5ec38afe4d591ba27d984b367c098d5d2
parent1e294917fd7d50b32c5e91430619e5c5e52c3ddf
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info