]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commit
projects / people / ms / ipfire-2.x.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit65457ceceb08622f00115cee3ae50e9ccd7c9a58
treed6d9ea87a488b07fdab912a6adf5653aac521c0atree
parent7323724196db7b63d83bea9774e2b1356b1854aacommit | diff
parent20da1edae775a93e9828acd111b03fdf217b3515commit | diff
Merge remote-tracking branch 'amarx/firewall' into firewall-next
Michael's tree of IPFire 2.x.