Merge branch 'andrea_tests' of git@gitorious.org:msoma/msoma.git into lore_tests
authorLorenzo Bettini <bettini@dsi.unifi.it>
Tue, 6 Jul 2010 08:31:58 +0000 (10:31 +0200)
committerLorenzo Bettini <bettini@dsi.unifi.it>
Tue, 6 Jul 2010 08:31:58 +0000 (10:31 +0200)
commit3a243d334c51baaf6ee1bf166aba3f9f2582e2df
tree8f94cc13f8e074232556235f2bb32eed28559ffc
parentcaa23523fb558dab5c9bfe0236c342aa9f860c26
parent568bfbd90cfe5f74821f82f18efca33bc1d60a2a
Merge branch 'andrea_tests' of git@gitorious.org:msoma/msoma.git into lore_tests

Conflicts:
msoma/debian/changelog
msoma/debian/copyright