Change version of pom.xml to 2.4.9-SNAPSHOT
Merging 2.4 into 2.6
Fixes #3901: Fix node group display page
Merge pull request #311 from VinceMacBuche/bug_3901/fix_node_group_page

Fixes #3901: Fix Node group display page
Fixes #3683: check that the regexp is valid before doing the release
Change version of pom.xml to 2.6.6-SNAPSHOT
Merge pull request #312 from ncharles/bug_3683/dev/validate_regex_in_search

Fixes #3683: check that the regexp is valid before doing the search
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/queries/LdapQueryProcessor.scala
Correct bad merge (sorry)
Fixes #3674: change the index to index node, execution timestamp
Merge pull request #313 from ncharles/bug_3674/dev/change_index_on_reports

Fixes #3674: change the index to index node, execution timestamp
Revert "Fixes #3674: change the index to index node, execution timestamp"

This reverts commit 40ed6ddbee92b6a42eaf667b8077b10005c85f84.
Fixes #3674: add composite index to improve perfs on node list page
Merge pull request #314 from ncharles/bug_3674/dev/change_index_on_reports

Bug 3674/dev/change index on reports
Fixes #3927: accept authorized net with space but remove them on submit
Merge pull request #315 from fanf/bug_3927/authorized_network_filed_must_strip_spaces

Fixes #3927: accept authorized net with space, remove them on user submit
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6
Fixes #3829: allow LDAP authentication mixed with rudder-users.xml defined authorization
Merge pull request #318 from fanf/bug_3829/ldap_authz_broken

Fixes #3829: allow LDAP authentication mixed with rudder-users.xml defined authorizations
Revert "Fixes #3829: allow LDAP authentication mixed with rudder-users.xml defined authorization"

This reverts commit efbf99c8e30fdfc9cf215ccf230ca0a3676cb4bf.