]> git.ipfire.org Git - people/dweismueller/ipfire-2.x.git/commitdiff
projects / people / dweismueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d28902 80b0f82)
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 patch | diff1 | diff2 | blob | history

diff --cc html/cgi-bin/vpnmain.cgi
Simple merge
Daniel's tree of IPFire 2.x.