]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a07aa9 3a60bf3)
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
Peter's tree of IPFire 2.x