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)
commit274ebe1d9d3390b94afe42e5b96273e171c3c6d3
treed1cbc178f58a19fba08f32cf36ba0521eccc00f8
parent8d289021d3c20f82b08d87fb9ee7296cedd705fe
parent80b0f82fef5a75b8ebc547f8ba40c8bf5b268b73
Merge remote-tracking branch 'origin/master' into next

Conflicts:
config/rootfiles/packages/clamav
lfs/clamav
html/cgi-bin/vpnmain.cgi