Wed, 27 Mar 2013 09:32:05 +0900Merge
Edouard Tisserant [Wed, 27 Mar 2013 09:32:05 +0900] rev 779
Merge

Tue, 26 Mar 2013 23:21:03 +0100Fixed conflict in internationalization with Beremiz CanFestival extension
Laurent Bessard [Tue, 26 Mar 2013 23:21:03 +0100] rev 778
Fixed conflict in internationalization with Beremiz CanFestival extension