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)
commit08f16718c2303fedc82b53eca7864235bced323b
tree4bdfd9e3c4b14778d6ffe1c1c585031982cda29f
parent97fbaa93a5d32c8afd62199c9913ee4a19917284
parentb101463cc262f48329f7780aeb48ea438b0f673c
Merge branch 'master' of git.hands.com/zavai

Conflicts:
debian/zavai.install