Merge remote-tracking branch 'origin/master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Mar 2015 22:58:47 +0000 (23:58 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Mar 2015 22:58:47 +0000 (23:58 +0100)
Conflicts:
config/rootfiles/packages/clamav
lfs/clamav

1  2 
html/cgi-bin/vpnmain.cgi

Simple merge