Conflicts: bureau/class/m_action.php bureau/class/m_bro.php bureau/class/m_dom.php debian/changelog install/mysql.sql install/upgrades/3.3.0~a.sql