Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 5 Jul 2010 18:04:54 +0000 (14:04 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 5 Jul 2010 18:04:54 +0000 (14:04 -0400)
commit819e2a567aa8e528b95cc6e146d5ee92fd486cc8
tree64b8236b4a80b7fd9cd4a8ae559868725a483ade
parentf6db10df21f04df83e109924647b07672050dbf3
parentcddb39cbf5d385273645f62f15bdf29b7607aac2
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info