projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 278280d 4e6ae99)
Merge branch 'firewall-fifteen' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 22 Oct 2013 19:10:25 +0000 (21:10 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 22 Oct 2013 19:10:25 +0000 (21:10 +0200)

Trivial merge
Timo's tree of IPFire 2.x