]> git.ipfire.org Git - people/amarx/ipfire-2.x.git/commitdiff
projects / people / amarx / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e967320 4e2bce1)
Merge branch 'outgoingfw' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 24 Aug 2012 13:29:29 +0000 (15:29 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 24 Aug 2012 13:29:29 +0000 (15:29 +0200)

Trivial merge
IPFire 2.x development tree