Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 18 Jun 2010 16:56:57 +0000 (12:56 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 18 Jun 2010 16:56:57 +0000 (12:56 -0400)
commit97c1ae2ef38f0602d879f4e391aad4f523e8c47a
tree834e15f3f3bbb18e8a51882fde19b217252a9b5c
parent9e4da76b5bc720bc3661bf15b0d7bffc704483f8
parentc52d8d263efeffbc31c097fae371b8c572834077
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info