]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
projects / people / ms / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7323724 20da1ed)
Merge remote-tracking branch 'amarx/firewall' into firewall-next firewall-next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 8 Aug 2013 13:01:36 +0000 (15:01 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 8 Aug 2013 13:01:36 +0000 (15:01 +0200)

Trivial merge
Michael's tree of IPFire 2.x.