Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
commitd50632674e8ed0b75ac991bcbfb20c26ddc4162c
authorJoey Hess <joey@kitenet.net>
Tue, 25 Jan 2011 00:02:10 +0000 (24 20:02 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 25 Jan 2011 00:02:10 +0000 (24 20:02 -0400)
treeac953b33d2b088bab79b2b9d20c4b7143dc031f0
parentb4d2910dda4124031d47c2a51a98536a78cb42e5
parentfc7bc6b83cb6c942b286be174c456fe77780751f
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info