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