]> 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: 48cc0e1 cad228f)
Merge remote-tracking branch 'trikolon/nginx' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 20 Jan 2014 19:22:10 +0000 (20:22 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 20 Jan 2014 19:22:10 +0000 (20:22 +0100)

Trivial merge
Timo's tree of IPFire 2.x