]> 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 | combined (merge: 8789de8 8ecb645)
Merge remote-tracking branch 'amarx/firewall-beta10' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 23 Dec 2013 13:59:56 +0000 (14:59 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 23 Dec 2013 13:59:56 +0000 (14:59 +0100)

Trivial merge
Timo's tree of IPFire 2.x