From: Alf Høgemark Date: Sat, 15 Feb 2014 14:13:16 +0000 (+0100) Subject: Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_... X-Git-Tag: v2.15-rc1~126^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10dfb491b13b4e11460cd10f3bbca21016002d20;p=ipfire-2.x.git Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_first_last --- 10dfb491b13b4e11460cd10f3bbca21016002d20