Merge branch 'tova' into autoconfig
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Jul 2008 19:54:45 +0000 (15:54 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Jul 2008 19:54:45 +0000 (15:54 -0400)
commit12c5786df4e74c143f24398b8d0028000b61daba
treea0f3136499610571b47289f6aa55659094024620
parent73af360e994306c1d0b14a69a4aa04750e61f0ef
parent106578f524a7ef8184029ac393dbe9d68b017756
Merge branch 'tova' into autoconfig

Conflicts:

debian/changelog
IkiWiki/Plugin/skeleton.pm.example
debian/changelog