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
..
_datasets	Adding defaults quota and policy table to phpunit	2014-08-01 18:10:06 +02:00
bureau/class	Merge branch 'stable-3.1'	2014-09-15 15:25:27 +02:00
DummyTest.php	[fix] SetUp and tearDown for tests should call parent props	2014-03-22 15:50:04 +01:00