Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 17 Jun 2010 20:52:33 +0000 (16:52 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 17 Jun 2010 20:52:33 +0000 (16:52 -0400)
commitf70bc8184ace2cf10687daedf2b7176f32ef8a97
treea3f4a4df37c90b5ea2b2565f2cc142c17514948e
parente35d728a3297c9caa9da696d35a8f3d51811f783
parent2e3f3ae89cfe66eb6be78003165cca1aff17ecb8
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info