]> 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: b631481 44bd254)
Merge remote-tracking branch 'alfh/feature_firewalllog_first_last' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Feb 2014 15:24:41 +0000 (16:24 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Feb 2014 15:24:41 +0000 (16:24 +0100)

Trivial merge
Peter's tree of IPFire 2.x