Merge branch 'master' into debian
authorAntonio Ospite <ospite@studenti.unina.it>
Sun, 27 Nov 2011 11:25:05 +0000 (12:25 +0100)
committerAntonio Ospite <ospite@studenti.unina.it>
Sun, 27 Nov 2011 11:25:05 +0000 (12:25 +0100)
commit7a1307447e59692be2cc6373f8066b034336274c
treeb108582ac8600735a1666dda468660c542506f59
parentd12c99394cb86bbf9c0657a596a4a26fe2b1c16d
parent41a72372660515b31678af6dead27067c7834556
Merge branch 'master' into debian