Merge branch 'master' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 9 Jan 2014 12:31:25 +0000 (13:31 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 9 Jan 2014 12:31:25 +0000 (13:31 +0100)
commit9063a04e94587fc38f410ec2234275417de201ad
tree3d45f320d331de129d13159202b8f73a0fa7a202
parentdf5a6ef76f2fad5aa08ec2959348f9eed9a48d70
parent42dbdb2088b7877ad1626d19db47089e07996b37
Merge branch 'master' into fifteen

Conflicts:
config/backup/backup.pl
config/backup/backup.pl
config/rootfiles/common/stage2
html/cgi-bin/ovpnmain.cgi