From: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Date: Tue, 10 Jul 2012 11:26:45 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.11-core61^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0c682c06f9bbbbeaca98efc1d6f48afef1bbe1b;p=people%2Fms%2Fipfire-2.x.git

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

b0c682c06f9bbbbeaca98efc1d6f48afef1bbe1b
diff --cc config/rootfiles/core/61/filelists/files
index 4942c1849b,56981ed01c..1624d83b54
--- a/config/rootfiles/core/61/filelists/files
+++ b/config/rootfiles/core/61/filelists/files
@@@ -1,9 -1,9 +1,10 @@@
  etc/system-release
  etc/issue
  etc/rc.d/init.d/collectd
+ opt/pakfire/lib/functions.sh
  srv/web/ipfire/cgi-bin/index.cgi
  srv/web/ipfire/cgi-bin/ovpnmain.cgi
 +srv/web/ipfire/cgi-bin/proxy.cgi
  var/ipfire/general-functions.pl
  var/ipfire/langs
  usr/sbin/redirect_wrapper