Merge branch 'branches/rudder/2.10' into branches/rudder/2.11 · Normation/rudder@a3235d6 · GitHub

Commit

Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Browse files

Conflicts:
	rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala

Loading branch information

fanf committed Oct 9, 2014

2 parents 9fd880a + bcb87d2 commit a3235d6