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 285b92f4b87ffc4df318b8c57b93715b73e3eb81 Merge: b8a646a a403303 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:03:59 2014 +0200 Merge branch 'master' into develop pom.xml | 2 +- .../fr/ifremer/wao/WaoTopiaPersistenceContext.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/ContactStates.java | 21 +++++++++++++++++++++ .../service/administration/ReferentialService.java | 1 + .../csv/operations/ContactStateParserFormatter.java | 21 +++++++++++++++++++++ .../wao/web/RedirectToContextPathRootFilter.java | 21 +++++++++++++++++++++ .../ifremer/wao/web/action/EditContactAction.java | 2 +- .../administration/InvalidateAllCachesAction.java | 21 +++++++++++++++++++++ .../administration/invalidate-all-caches-input.jsp | 20 ++++++++++++++++++++ .../WEB-INF/content/templates/td-effort-obsmer.jsp | 20 ++++++++++++++++++++ .../webapp/WEB-INF/content/templates/td-effort.jsp | 20 ++++++++++++++++++++ 11 files changed, 168 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.