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)
commit057652c5e548c5e0b0e4e07559c21b7916335af9
tree8627e6afd0fa20870476e7b1d381c78ba99e67e1
parent48cc0e123ac601d0deada6f1feeeb2bae0f6631a
parentcad228f74c10521919dae36192430ed372d08ca8
Merge remote-tracking branch 'trikolon/nginx' into next