Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 23 Jun 2011 21:42:48 +0000 (17:42 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 23 Jun 2011 21:42:48 +0000 (17:42 -0400)
commit09c70360f5b25bba38f94b4a457ffd54941a1874
tree909ee0860a3e0e6fcca48b1ee19297f9a74c9602
parent46064d6d631326ce8e2c675c81528747049b6285
parentc0bf3231bf5e8a5c65b5375c39484971b3d04411
Merge branch 'master' of ssh://git.ikiwiki.info