From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 4 Sep 2011 13:52:11 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.9-core53~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ea9703e69f3453b147b6b02e8258775d30ee6e9;p=ipfire-2.x.git

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

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

3ea9703e69f3453b147b6b02e8258775d30ee6e9
diff --cc config/rootfiles/core/next/filelists/files
index 7b85a54462,95cde2cd89..d2a8d6de4d
--- a/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