people/teissler/ipfire-2.x.git
6 years agoMerge remote-tracking branch 'alfh/feature_updxlrator' into next
Michael Tremer [Wed, 19 Feb 2014 19:46:21 +0000 (20:46 +0100)] 
Merge remote-tracking branch 'alfh/feature_updxlrator' into next

6 years agostrongswan: Update to 5.1.2rc1.
Michael Tremer [Tue, 18 Feb 2014 14:16:08 +0000 (15:16 +0100)] 
strongswan: Update to 5.1.2rc1.

6 years agofirewall: Import Turkish translation.
Ersan Yildirim [Mon, 17 Feb 2014 16:24:14 +0000 (17:24 +0100)] 
firewall: Import Turkish translation.

6 years agoUpdate translations.
Michael Tremer [Mon, 17 Feb 2014 15:40:14 +0000 (16:40 +0100)] 
Update translations.

6 years agoMerge remote-tracking branch 'alfh/feature_htmlcleanup' into next
Michael Tremer [Mon, 17 Feb 2014 15:33:38 +0000 (16:33 +0100)] 
Merge remote-tracking branch 'alfh/feature_htmlcleanup' into next

Conflicts:
html/cgi-bin/logs.cgi/firewalllogip.dat
html/cgi-bin/logs.cgi/firewalllogport.dat
html/cgi-bin/media.cgi

6 years agoMerge remote-tracking branch 'alfh/feature_langfixes' into next
Michael Tremer [Mon, 17 Feb 2014 15:28:23 +0000 (16:28 +0100)] 
Merge remote-tracking branch 'alfh/feature_langfixes' into next

6 years agoMerge remote-tracking branch 'alfh/feature_firewalllog_first_last' into next
Michael Tremer [Mon, 17 Feb 2014 15:24:41 +0000 (16:24 +0100)] 
Merge remote-tracking branch 'alfh/feature_firewalllog_first_last' into next

6 years agoRevert "perl-PDF-Create: New package"
Michael Tremer [Mon, 17 Feb 2014 15:17:45 +0000 (16:17 +0100)] 
Revert "perl-PDF-Create: New package"

This reverts commit e7f5c0465ba009549aeb3c61627e26984db576f8.

6 years agoSet version to 2.15 beta2.
Arne Fitzenreiter [Sun, 16 Feb 2014 07:47:31 +0000 (08:47 +0100)] 
Set version to 2.15 beta2.

6 years agonginx: remove tcp_proxy_module patch.
Arne Fitzenreiter [Sun, 16 Feb 2014 07:10:11 +0000 (08:10 +0100)] 
nginx: remove tcp_proxy_module patch.

6 years agoglibc: Backport hotfixes from RHEL6.
Michael Tremer [Sat, 15 Feb 2014 18:40:08 +0000 (19:40 +0100)] 
glibc: Backport hotfixes from RHEL6.

6 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Michael Tremer [Sat, 15 Feb 2014 17:42:37 +0000 (18:42 +0100)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

6 years agofireinfo: Exclude some more patterns.
Michael Tremer [Sat, 15 Feb 2014 17:40:55 +0000 (18:40 +0100)] 
fireinfo: Exclude some more patterns.

6 years agou-boot: limit videores to 800x600.
Arne Fitzenreiter [Sat, 15 Feb 2014 16:50:00 +0000 (17:50 +0100)] 
u-boot: limit videores to 800x600.

pandaboard has display problems on console with higher resolutions.

6 years agokernel: disable cpu-idle and debug_ll on arm-multiarch kernel.
Arne Fitzenreiter [Sat, 15 Feb 2014 16:49:17 +0000 (17:49 +0100)] 
kernel: disable cpu-idle and debug_ll on arm-multiarch kernel.

6 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Arne Fitzenreiter [Sat, 15 Feb 2014 16:48:35 +0000 (17:48 +0100)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

6 years agokernel: enable hyperv driver.
Arne Fitzenreiter [Sat, 15 Feb 2014 16:47:07 +0000 (17:47 +0100)] 
kernel: enable hyperv driver.

6 years agocgi-bin: HTML cleanup, add quotes for attribute values
Alf Høgemark [Sat, 15 Feb 2014 15:54:38 +0000 (16:54 +0100)] 
cgi-bin: HTML cleanup, add quotes for attribute values

6 years agoatm-status.cgi: display more values for solos-pci.
Arne Fitzenreiter [Sat, 15 Feb 2014 15:41:40 +0000 (16:41 +0100)] 
atm-status.cgi: display more values for solos-pci.

6 years agoleds: add geos router support, updated alix leds.
Arne Fitzenreiter [Sat, 15 Feb 2014 15:39:22 +0000 (16:39 +0100)] 
leds: add geos router support, updated alix leds.

6 years agokernel: cs5535audio spam the syslog with access errors.
Arne Fitzenreiter [Sat, 15 Feb 2014 15:29:31 +0000 (16:29 +0100)] 
kernel: cs5535audio spam the syslog with access errors.

On geos boards the cs5535 is present but the ac97 is not there.

6 years agokernel: add some missing gpio modules.
Arne Fitzenreiter [Sat, 15 Feb 2014 15:27:20 +0000 (16:27 +0100)] 
kernel: add some missing gpio modules.

the gpio modules are needed for led's on alix and geos boards.

6 years agocgi-bin and themes: Remove language attribute on script tag
Alf Høgemark [Tue, 11 Feb 2014 18:42:35 +0000 (19:42 +0100)] 
cgi-bin and themes: Remove language attribute on script tag

6 years agologs.cgi: htmlcleanup, change html tags from uppercase to lowercase
Alf Høgemark [Tue, 11 Feb 2014 18:06:32 +0000 (19:06 +0100)] 
logs.cgi: htmlcleanup, change html tags from uppercase to lowercase

6 years agopppsetup.cgi: htmlcleanup, change html tags from uppercase to lowercase
Alf Høgemark [Sun, 9 Feb 2014 11:45:53 +0000 (12:45 +0100)] 
pppsetup.cgi: htmlcleanup, change html tags from uppercase to lowercase

6 years agoiptables.cgi: htmlcleanup, change html tags from uppercase to lowercase
Alf Høgemark [Sun, 9 Feb 2014 11:45:31 +0000 (12:45 +0100)] 
iptables.cgi: htmlcleanup, change html tags from uppercase to lowercase

6 years agogui.cgi: htmlcleanup, change html tags from uppercase to lowercase
Alf Høgemark [Sun, 9 Feb 2014 11:44:58 +0000 (12:44 +0100)] 
gui.cgi: htmlcleanup, change html tags from uppercase to lowercase

6 years agoservices.cgi: htmlcleanup, change html tags from uppercase to lowercase
Alf Høgemark [Sun, 9 Feb 2014 11:23:50 +0000 (12:23 +0100)] 
services.cgi: htmlcleanup, change html tags from uppercase to lowercase

6 years agoremote.cgi: htmlcleanup, change html tags from uppercase to lowercase
Alf Høgemark [Sun, 9 Feb 2014 11:23:06 +0000 (12:23 +0100)] 
remote.cgi: htmlcleanup, change html tags from uppercase to lowercase

6 years agopppsetup.cgi: htmlcleanup, change html tags from uppercase to lowercase
Alf Høgemark [Sun, 9 Feb 2014 11:22:46 +0000 (12:22 +0100)] 
pppsetup.cgi: htmlcleanup, change html tags from uppercase to lowercase

6 years agoovpnmain.cgi: htmlcleanup, change html tags from uppercase to lowercase
Alf Høgemark [Sun, 9 Feb 2014 11:20:35 +0000 (12:20 +0100)] 
ovpnmain.cgi: htmlcleanup, change html tags from uppercase to lowercase

6 years agofireinfo.cgi: htmlcleanup, change html tags from uppercase to lowercase
Alf Høgemark [Sun, 9 Feb 2014 11:17:35 +0000 (12:17 +0100)] 
fireinfo.cgi: htmlcleanup, change html tags from uppercase to lowercase

6 years agoids.cgi: htmlcleanup, change html tags from uppercase to lowercase
Alf Høgemark [Sun, 9 Feb 2014 10:54:56 +0000 (11:54 +0100)] 
ids.cgi: htmlcleanup, change html tags from uppercase to lowercase

6 years agomedia.cgi: htmlcleanup, change <B> tag to <b>, and fix attribute quotation
Alf Høgemark [Sun, 9 Feb 2014 10:51:34 +0000 (11:51 +0100)] 
media.cgi: htmlcleanup, change <B> tag to <b>, and fix attribute quotation

6 years agoqos.cgi: Use Language string for legend in graph
Alf Høgemark [Sat, 15 Feb 2014 14:43:56 +0000 (15:43 +0100)] 
qos.cgi: Use Language string for legend in graph

6 years agofirewalllog.dat: Use language string keys already defined
Alf Høgemark [Tue, 11 Feb 2014 19:19:11 +0000 (20:19 +0100)] 
firewalllog.dat: Use language string keys already defined

6 years agofirewalllogport.dat: Use language string keys already defined
Alf Høgemark [Tue, 11 Feb 2014 19:11:10 +0000 (20:11 +0100)] 
firewalllogport.dat: Use language string keys already defined

6 years agofirewalllogip.dat: Use language string keys already defined
Alf Høgemark [Tue, 11 Feb 2014 19:10:40 +0000 (20:10 +0100)] 
firewalllogip.dat: Use language string keys already defined

6 years agocountry.cgi: Use language string keys already defined
Alf Høgemark [Tue, 11 Feb 2014 19:10:03 +0000 (20:10 +0100)] 
country.cgi: Use language string keys already defined

6 years agoovpnmain.cgi: Use language string keys already defined
Alf Høgemark [Sun, 9 Feb 2014 10:19:58 +0000 (11:19 +0100)] 
ovpnmain.cgi: Use language string keys already defined

6 years agoqos.cgi: Use language string keys already defined
Alf Høgemark [Sun, 9 Feb 2014 10:19:19 +0000 (11:19 +0100)] 
qos.cgi: Use language string keys already defined

6 years agomedia.cgi: Use language string keys already defined
Alf Høgemark [Sun, 9 Feb 2014 10:03:04 +0000 (11:03 +0100)] 
media.cgi: Use language string keys already defined

6 years agoindex.cgi: Use language string keys already defined
Alf Høgemark [Sun, 9 Feb 2014 09:45:55 +0000 (10:45 +0100)] 
index.cgi: Use language string keys already defined

6 years agofirewalllog.dat: Use language string for First and Last text
Alf Høgemark [Sat, 15 Feb 2014 14:16:06 +0000 (15:16 +0100)] 
firewalllog.dat: Use language string for First and Last text

6 years agoMerge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_...
Alf Høgemark [Sat, 15 Feb 2014 14:13:16 +0000 (15:13 +0100)] 
Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_first_last

6 years agoupdxlrator: Add support for tar.xz files
Alf Høgemark [Sat, 15 Feb 2014 09:01:51 +0000 (10:01 +0100)] 
updxlrator: Add support for tar.xz files

6 years agoupdxlrator: Handle colon in filenames in updatexlrator.cgi
Alf Høgemark [Wed, 5 Feb 2014 19:02:44 +0000 (20:02 +0100)] 
updxlrator: Handle colon in filenames in updatexlrator.cgi

The updatexlrator.cgi is assuming that colon is not part of any
filenames downloaded by updxlrator. Fix this by fixing regular
expression used for listing pending download files, and by
fixing regular expression used to listing files in maintenance view.

The fix for listing in maintenance is not very nice, I just use
":separator:" as field separator instead of just ":", which was used
earlier. This should make it very unlikely to collide with a part of
the filename.

Also make the files in download be sorted using lower case, like it is
done for files in the vendor path.

The problem can be reproduced by downloading
http://mirror.us.leaseweb.net/archlinux/community/os/x86_64/
docker-1:0.7.6-1-x86_64.pkg.tar.xz, after pkg.tar.xz files support has
been added to updxlrator.

6 years agoupdxlrator: Add support for ArchLinux pkg.tar.xz files
Alf Høgemark [Wed, 5 Feb 2014 18:03:35 +0000 (19:03 +0100)] 
updxlrator: Add support for ArchLinux pkg.tar.xz files

Add support for caching package files for ArchLinux in updxlrator, by
adding pkg.tar.xz to the regular expression for Linux vendor.

6 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Arne Fitzenreiter [Fri, 14 Feb 2014 22:41:45 +0000 (23:41 +0100)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

6 years agokernel: add some omap/pandaboard patches.
Arne Fitzenreiter [Fri, 14 Feb 2014 22:41:13 +0000 (23:41 +0100)] 
kernel: add some omap/pandaboard patches.

6 years agokernel: update i586 config.
Arne Fitzenreiter [Fri, 14 Feb 2014 22:26:31 +0000 (23:26 +0100)] 
kernel: update i586 config.

6 years agokernel: fix imq patch for 3.10.30.
Arne Fitzenreiter [Fri, 14 Feb 2014 21:24:05 +0000 (22:24 +0100)] 
kernel: fix imq patch for 3.10.30.

kernel: fix imq patch for 3.10.30 and remove old patches.

6 years agokernel: update to 3.10.30.
Arne Fitzenreiter [Fri, 14 Feb 2014 17:08:24 +0000 (18:08 +0100)] 
kernel: update to 3.10.30.

6 years agokernel: enable gpio_expander for alix led's.
Arne Fitzenreiter [Fri, 14 Feb 2014 17:04:32 +0000 (18:04 +0100)] 
kernel: enable gpio_expander for alix led's.

6 years agofireinfo: Remove old patch.
Michael Tremer [Fri, 14 Feb 2014 16:38:16 +0000 (17:38 +0100)] 
fireinfo: Remove old patch.

6 years agofireinfo: Update to 2.1.9.
Michael Tremer [Fri, 14 Feb 2014 16:37:17 +0000 (17:37 +0100)] 
fireinfo: Update to 2.1.9.

6 years agosysctl: Load variables first thing when booting.
Michael Tremer [Fri, 14 Feb 2014 16:35:37 +0000 (17:35 +0100)] 
sysctl: Load variables first thing when booting.

6 years agofirewall: Load init script functions.
Michael Tremer [Fri, 14 Feb 2014 15:10:21 +0000 (16:10 +0100)] 
firewall: Load init script functions.

6 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Michael Tremer [Fri, 14 Feb 2014 12:50:01 +0000 (13:50 +0100)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

6 years agoindex.cgi: Fix showing DNS servers.
Michael Tremer [Fri, 14 Feb 2014 12:49:37 +0000 (13:49 +0100)] 
index.cgi: Fix showing DNS servers.

6 years agofirewall: Use --wait for all iptables commands.
Michael Tremer [Fri, 14 Feb 2014 12:04:18 +0000 (13:04 +0100)] 
firewall: Use --wait for all iptables commands.

6 years agofirewall: Load conntrack modules in firewall script.
Michael Tremer [Fri, 14 Feb 2014 11:54:08 +0000 (12:54 +0100)] 
firewall: Load conntrack modules in firewall script.

6 years agoMove enabling nf_conntrack_acct where it should be.
Michael Tremer [Fri, 14 Feb 2014 11:52:28 +0000 (12:52 +0100)] 
Move enabling nf_conntrack_acct where it should be.

6 years agofirewall: Initialize basic ruleset before entering runlevel 3.
Michael Tremer [Fri, 14 Feb 2014 11:48:11 +0000 (12:48 +0100)] 
firewall: Initialize basic ruleset before entering runlevel 3.

6 years agonetwork: Remove redundant insertion of wireless rules.
Michael Tremer [Fri, 14 Feb 2014 11:41:23 +0000 (12:41 +0100)] 
network: Remove redundant insertion of wireless rules.

6 years agonetwork: Remove old accounting code.
Michael Tremer [Fri, 14 Feb 2014 11:40:57 +0000 (12:40 +0100)] 
network: Remove old accounting code.

6 years agofirewall: Call firewall.local start at the very end.
Michael Tremer [Fri, 14 Feb 2014 11:40:11 +0000 (12:40 +0100)] 
firewall: Call firewall.local start at the very end.

6 years agofirewall: Use --wait for every iptables call.
Michael Tremer [Fri, 14 Feb 2014 11:35:40 +0000 (12:35 +0100)] 
firewall: Use --wait for every iptables call.

6 years agoFix missing string in proxy.cgi (Cache-Digest creation).
Michael Tremer [Fri, 14 Feb 2014 11:15:37 +0000 (12:15 +0100)] 
Fix missing string in proxy.cgi (Cache-Digest creation).

6 years agotor: Bump package version to 6 and fix backup.
Michael Tremer [Thu, 13 Feb 2014 14:39:35 +0000 (15:39 +0100)] 
tor: Bump package version to 6 and fix backup.

The backup include file is missing in older releases
and will be created on the fly when updating old packages.

6 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Michael Tremer [Thu, 13 Feb 2014 14:31:25 +0000 (15:31 +0100)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

6 years agofirewalllog.dat: Use language string for First and Last links
Alf Høgemark [Wed, 12 Feb 2014 20:26:26 +0000 (21:26 +0100)] 
firewalllog.dat: Use language string for First and Last links

6 years agofirewalllog.dat: Add First and Last links, for fast navigation in log lines
Alf Høgemark [Sat, 8 Feb 2014 07:12:53 +0000 (08:12 +0100)] 
firewalllog.dat: Add First and Last links, for fast navigation in log lines

Add two links for navigating in log pages, one for going to the
first page and one for goint to the last page.

Introduce variable which points to the first log line to
display on the last possible page.

The commit contains hardcoded text for Last and First, and I
am also uncertain how spaces between links should be handled.
So this should be improved based on feedback.

6 years agonetexternal.cgi: Fix display of DNS1 and DNS2
Alf Høgemark [Sat, 8 Feb 2014 06:32:08 +0000 (07:32 +0100)] 
netexternal.cgi: Fix display of DNS1 and DNS2

6 years agopartresize: fix output redirection to dev/zero.
Arne Fitzenreiter [Wed, 12 Feb 2014 00:02:08 +0000 (01:02 +0100)] 
partresize: fix output redirection to dev/zero.

6 years agolinux: Fix grsecurity-related crash on Intel Haswell CPUs.
Michael Tremer [Tue, 11 Feb 2014 15:54:48 +0000 (16:54 +0100)] 
linux: Fix grsecurity-related crash on Intel Haswell CPUs.

6 years agotor: Update to 0.2.4.20.
Michael Tremer [Tue, 11 Feb 2014 15:54:09 +0000 (16:54 +0100)] 
tor: Update to 0.2.4.20.

6 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Michael Tremer [Tue, 11 Feb 2014 11:00:40 +0000 (12:00 +0100)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

6 years agoperl-PDF-Create: New package
Alexander Marx [Tue, 11 Feb 2014 03:52:26 +0000 (04:52 +0100)] 
perl-PDF-Create: New package

This package allows to create PDF documents from
perl scripts.

6 years agopartresize: resize partition before c,h,s changes.
Arne Fitzenreiter [Mon, 10 Feb 2014 23:23:11 +0000 (00:23 +0100)] 
partresize: resize partition before c,h,s changes.

6 years agolinux: Fix IMQ crash.
Michael Tremer [Mon, 10 Feb 2014 22:00:19 +0000 (23:00 +0100)] 
linux: Fix IMQ crash.

Fixes #10474.

6 years agoglibc: Include getconf in image.
Michael Tremer [Mon, 10 Feb 2014 21:10:49 +0000 (22:10 +0100)] 
glibc: Include getconf in image.

Also include missing getent for ARM.

6 years agonginx: remove tcp_proxy_module patch.
Arne Fitzenreiter [Sun, 9 Feb 2014 14:39:22 +0000 (15:39 +0100)] 
nginx: remove tcp_proxy_module patch.

6 years agocore76: remove hardcoded kernel version.
Arne Fitzenreiter [Sat, 8 Feb 2014 10:54:00 +0000 (11:54 +0100)] 
core76: remove hardcoded kernel version.

6 years agorootfile updates: perl-DBI, perl-File-ReadBackwards.
Arne Fitzenreiter [Fri, 7 Feb 2014 22:10:22 +0000 (23:10 +0100)] 
rootfile updates: perl-DBI, perl-File-ReadBackwards.

6 years agokernel: update to 3.10.29.
Arne Fitzenreiter [Fri, 7 Feb 2014 19:16:35 +0000 (20:16 +0100)] 
kernel: update to 3.10.29.

6 years agofireinfo: Fix finding the root device.
Michael Tremer [Fri, 7 Feb 2014 13:59:50 +0000 (14:59 +0100)] 
fireinfo: Fix finding the root device.

6 years agostrongswan: Update to 5.1.2dr3.
Michael Tremer [Fri, 7 Feb 2014 13:49:03 +0000 (14:49 +0100)] 
strongswan: Update to 5.1.2dr3.

6 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Michael Tremer [Wed, 5 Feb 2014 12:38:25 +0000 (13:38 +0100)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

6 years agonetwork-vlans: Provide a better configuation file.
Michael Tremer [Wed, 5 Feb 2014 12:15:31 +0000 (13:15 +0100)] 
network-vlans: Provide a better configuation file.

As suggested by Bernhard Bitsch, #10470.

6 years agopartresize: update c,h,s values before resize.
Arne Fitzenreiter [Wed, 5 Feb 2014 09:52:46 +0000 (10:52 +0100)] 
partresize: update c,h,s values before resize.

Some cards fail with wrong translations so the values are updated before resize.

6 years agokrng: default entropy pool has 2kb with grsecurity.
Arne Fitzenreiter [Tue, 4 Feb 2014 17:50:02 +0000 (18:50 +0100)] 
krng: default entropy pool has 2kb with grsecurity.

6 years agoRevert "krng: use kernel entropy if no random-seed is stored."
Arne Fitzenreiter [Tue, 4 Feb 2014 17:49:00 +0000 (18:49 +0100)] 
Revert "krng: use kernel entropy if no random-seed is stored."

This reverts commit 1c72742bca7e8e5e6151c77481e9110f6b8a1cf4.

6 years agoshutdown.cgi: fix missing image.
Arne Fitzenreiter [Tue, 4 Feb 2014 15:13:57 +0000 (16:13 +0100)] 
shutdown.cgi: fix missing image.

6 years agobackup.pl: remove wrong curly bracket.
Arne Fitzenreiter [Tue, 4 Feb 2014 15:01:43 +0000 (16:01 +0100)] 
backup.pl: remove wrong curly bracket.

6 years agocore76: Sort exclude file alphabetically.
Michael Tremer [Tue, 4 Feb 2014 11:55:33 +0000 (12:55 +0100)] 
core76: Sort exclude file alphabetically.

6 years agoNever include rc.local or firewall.local in a core update.
Michael Tremer [Tue, 4 Feb 2014 11:51:21 +0000 (12:51 +0100)] 
Never include rc.local or firewall.local in a core update.

6 years agofirewall.cgi: Fix path to firewall-lib.pl.
Michael Tremer [Tue, 4 Feb 2014 11:48:01 +0000 (12:48 +0100)] 
firewall.cgi: Fix path to firewall-lib.pl.

6 years agoopenvpn: Wrong subnet calculation bug fix.
Alexander Marx [Fri, 31 Jan 2014 20:23:21 +0000 (21:23 +0100)] 
openvpn: Wrong subnet calculation bug fix.

Fixes #10466.

6 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Michael Tremer [Sun, 2 Feb 2014 13:38:02 +0000 (14:38 +0100)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next