Merge remote-tracking branch 'alfh/feature_firewalllog_centergraph' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Mar 2014 21:04:44 +0000 (22:04 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Mar 2014 21:04:44 +0000 (22:04 +0100)

Trivial merge