This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 126239c0623e687892b4c948ca65322f2c11de72 Merge: b1a38ac d845dfe Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 12:02:11 2014 +0200 Merge branch 'release/1.5.6' pollen-persistence/pom.xml | 4 +- .../business/persistence/CommentDAOImpl.java | 31 +-- .../business/persistence/CommentDAOImplTest.java | 60 ---- pollen-services/LICENSE.txt | 2 +- pollen-services/pom.xml | 2 +- .../pollen/services/impl/PollCommentService.java | 14 - .../pollen/services/impl/PollFeedService.java | 125 ++++++--- pollen-ui-struts2/LICENSE.txt | 2 +- pollen-ui-struts2/pom.xml | 2 +- .../pollen/ui/actions/json/GetPollComments.java | 109 -------- .../webapp/WEB-INF/decorators/layout-default.jsp | 6 +- pollen-votecounting-aggregator/LICENSE.txt | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/LICENSE.txt | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/LICENSE.txt | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/LICENSE.txt | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/LICENSE.txt | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/LICENSE.txt | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/LICENSE.txt | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/LICENSE.txt | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/LICENSE.txt | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 303 ++++++++++----------- src/site/site_en.xml | 66 +---- src/site/site_fr.xml | 69 +---- 32 files changed, 282 insertions(+), 549 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.