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
Change version of scala-ldap tag in pom.xml from 2.5.0-SNAPSHOT to 2.5.1-SNAPSHOT
Merge branch 'branches/rudder/2.5'

Conflicts:
	pom.xml
Updated the version to 2.4.4-SNAPSHOT to let the development continue peacefully
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

* branches/rudder/2.4:
  Updated the version to 2.4.4-SNAPSHOT to let the development continue peacefully

Conflicts:
	pom.xml
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Updated the version to 2.4.4-SNAPSHOT to let the development continue peacefully
Fixes #3240 : Upgrade scala-ldap to Scala 2.10
Merge pull request #3 from VinceMacBuche/proto_scala2.10

Ref #3229 : Scala 2.10
Add a RW/RO LDAP Connection