projects
/
ipfire-2.x.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
48cc0e1
cad228f
)
Merge remote-tracking branch 'trikolon/nginx' into next
author
Michael Tremer
<michael.tremer@ipfire.org>
Mon, 20 Jan 2014 19:22:10 +0000
(20:22 +0100)
committer
Michael Tremer
<michael.tremer@ipfire.org>
Mon, 20 Jan 2014 19:22:10 +0000
(20:22 +0100)
Trivial merge