This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 33761047bcc8747a53068a132222b38e8bcd1ec0 Merge: d2cb61f 8ed5935 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 12 11:24:30 2014 +0000 Merge branch 'release/4.2.2' pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../src/main/java/fr/ifremer/wao/WaoUtils.java | 29 ++++++++++--- .../src/test/java/fr/ifremer/wao/WaoUtilsTest.java | 50 ++++++++++++++++------ wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 11 ++++- .../ifremer/wao/services/service/SamplingPlan.java | 4 +- .../mail/AddBoatToUserAllegroWalletEmail.java | 6 ++- .../AddBoatToUserAllegroWalletEmail_en.mustache | 3 +- .../AddBoatToUserAllegroWalletEmail_fr.mustache | 3 +- .../resources/i18n/wao-services_en_GB.properties | 2 +- .../resources/i18n/wao-services_fr_FR.properties | 2 +- wao-web/pom.xml | 2 +- .../action/administration/EditWaoUserAction.java | 4 ++ .../main/resources/i18n/wao-web_en_GB.properties | 1 + .../main/resources/i18n/wao-web_fr_FR.properties | 1 + 16 files changed, 91 insertions(+), 33 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.