Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Conflicts:
	config/rootfiles/core/next/filelists/files

diff --cc config/rootfiles/core/next/filelists/files
index 7b85a54462e5de3b93d165e28c34ccdf996fba55,95cde2cd89b939480a8048aa99f2124e6243cd0a..d2a8d6de4dda3e29b2308f06d11343a44cc9460b
--- 1/config/rootfiles/core/next/filelists/files
--- 2/config/rootfiles/core/next/filelists/files
+++ b/config/rootfiles/core/next/filelists/files
@@@ -13,6 -17,5 +19,7 @@@ var/ipfire/langs/es.p
  var/ipfire/langs/fr.pl
  var/ipfire/langs/pl.pl
  usr/local/bin/ipsecctrl
+ usr/local/bin/openvpnctrl
  usr/local/bin/vpn-watch
 +usr/local/bin/rebuildroutes
 +var/ipfire/main/routing