Merge branch 'httpreq-proxy'
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 23 Nov 2014 14:16:42 +0000 (15:16 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 23 Nov 2014 14:16:42 +0000 (15:16 +0100)

Trivial merge