fixes #3344: removed contrib non free
Merge pull request #9 from aesraethr/bug_3344/doc/remove_contrib_nonfree

fixes #3344: removed contrib non free
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4

* branches/rudder/2.3:
  fixes #3344: removed contrib non free

Conflicts:
	10_install_server/11_install_root_server_debian.txt
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

* branches/rudder/2.4:
  fixes #3344: removed contrib non free

Conflicts:
	10_install_server/11_install_root_server_debian.txt