alban 5a31dc9b96 Merge branch 'stable-3.1' ... 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		2014-09-15 15:25:27 +02:00
..
class	Merge branch 'stable-3.1'	2014-09-15 15:25:27 +02:00