Benjamin Sonntag 34526aa906 fixing merge bug with trunk		2011-06-04 13:56:10 +00:00
..
POTFILES.in	…
fr.po	adding correct dependency on apache2 version + adding default_mx2 variable in debhelper + updating changelog to reflect MX changes + removing MX field in domaines table + restricting defmx/defmx2 to ADMIN only (xals, could you merge please?)	2011-06-04 08:46:54 +00:00
templates.pot	fixing merge bug with trunk	2011-06-04 13:56:10 +00:00