Merge branch 'master' of http://git.hands.com/zavai
authorEnrico Zini <enrico@enricozini.org>
Fri, 18 Dec 2009 11:02:57 +0000 (11:02 +0000)
committerEnrico Zini <enrico@enricozini.org>
Fri, 18 Dec 2009 11:02:57 +0000 (11:02 +0000)
Conflicts:
debian/zavai.install


Trivial merge