nginx (1:1.2.6-2bbox2): Fix broken listen line in default config
Merge branch 'master' into ruby-ng

Conflicts:
	debian/changelog