]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 5d4d41b 3a162dc)
Merge remote-tracking branch 'amarx/firewall-fifteen-beta9' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 10 Dec 2013 12:31:38 +0000 (13:31 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 10 Dec 2013 12:31:38 +0000 (13:31 +0100)

Trivial merge
Timo's tree of IPFire 2.x