Alexis Lahouze c483e175a6 Fixed merge error.		2011-06-04 15:10:11 +00:00
..
manual.po	Fixed merge error.	2011-06-04 15:10:11 +00:00
messages.po	Merged changesets 2970, 2972, 2984, 2986, 2987 and 2988 from branch stable 1.0 to trunk.	2011-06-04 14:28:57 +00:00