nginx 1.6.0, headersmore 0.25, subs 0.6.4
Merge remote-tracking branch 'origin/master'

Conflicts:
	Formula/nginx.rb