From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 20 Jan 2014 19:22:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'trikolon/nginx' into next
X-Git-Tag: v2.15-beta2~82
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=057652c5e548c5e0b0e4e07559c21b7916335af9

Merge remote-tracking branch 'trikolon/nginx' into next
---

057652c5e548c5e0b0e4e07559c21b7916335af9