Issue #3166: missing updated dependency to 2.6.0-SNAPSHOT
Update the POMs to prepare the Rudder 2.5.0 RC1 release
After release 2.5.0 RC1, change back pom to SNAPSHOT
Merge branch 'branches/rudder/2.5'
Change version of pom.xml from 2.5.0-SNAPSHOT to 2.5.0
Change version of pom.xml from 2.5.0 to 2.5.1-SNAPSHOT
Fix typo introduced by two previous commit about pom.xml
Updated the POM versions to 2.4.4
Revert "Updated the POM versions to 2.4.4"

This reverts commit 659c6aeabf76171838a73f45e1807e7b7eff12b1.
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5'

Conflicts:
	pom.xml
Merge branch 'master' into proto_scala2.10

* master:
  Revert "Updated the POM versions to 2.4.4"
  Updated the POM versions to 2.4.4
  Fix typo introduced by two previous commit about pom.xml
  Change version of pom.xml from 2.5.0 to 2.5.1-SNAPSHOT
  Change version of pom.xml from 2.5.0-SNAPSHOT to 2.5.0
  After release 2.5.0 RC1, change back pom to SNAPSHOT
  Update the POMs to prepare the Rudder 2.5.0 RC1 release
  Issue #3166: missing updated dependency to 2.6.0-SNAPSHOT

Conflicts:
	pom.xml