drigato 2fadc8f8f1 Merge branch '2.5.x' into saas ... Conflicts: CREDITS		2015-01-20 11:44:53 -05:00
..
LC_MESSAGES	Merge branch '2.5.x' into saas	2015-01-20 11:44:53 -05:00