This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 8670e96 [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development new d9f270c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds f6d7463 [jgitflow-maven-plugin]updating poms for branch '1.5.6' with snapshot versions new 0214f49 fix license files new d845dfe [jgitflow-maven-plugin]updating poms for branch'release/1.5.6' with non-snapshot versions new 126239c Merge branch 'release/1.5.6' new e9299e1 Merge branch 'master' into develop new f8389b5 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f8389b5e9b14aaf52c117e7b03c6574c33f56497 Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 12:02:20 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e9299e1b2619ad64cc8b906d6fd5fc48effdcf0b Merge: d9f270c 126239c Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 12:02:17 2014 +0200 Merge branch 'master' into develop commit d9f270c0b9253aeaaf0bbb46e22e2f011e4c47cc Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 12:02:16 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts 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' commit d845dfe117d0c06abc4cf0fc6ce9b404aa2bef89 Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 11:57:55 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.5.6' with non-snapshot versions commit 0214f4954e8013dd4e81a3b26db38c0be0155ba1 Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 11:54:37 2014 +0200 fix license files Summary of changes: pollen-services/LICENSE.txt | 2 +- pollen-ui-struts2/LICENSE.txt | 2 +- pollen-votecounting-aggregator/LICENSE.txt | 2 +- pollen-votecounting-api/LICENSE.txt | 2 +- pollen-votecounting-borda/LICENSE.txt | 2 +- pollen-votecounting-condorcet/LICENSE.txt | 2 +- pollen-votecounting-coombs/LICENSE.txt | 2 +- pollen-votecounting-instant-runoff/LICENSE.txt | 2 +- pollen-votecounting-normal/LICENSE.txt | 2 +- pollen-votecounting-number/LICENSE.txt | 2 +- pollen-votecounting-percentage/LICENSE.txt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.