Imported Upstream version 1.2.1
Merge remote-tracking branch 'debian/master'

Conflicts:
	debian/changelog
	debian/control
Merge tag 'upstream/1.2.2'

Upstream version 1.2.2
patch naxsi to fix build on nginx 1.2.2
remove start-stop-daemon --retry for now
nginx (1:1.2.2-1bbox1)
added upstream-check-module
Added health check to descriptions
nginx (1:1.2.2-1bbox2) Added upstream-check-module
Merge remote-tracking branch 'debian/master'

Conflicts:
	debian/changelog
	debian/nginx-common.nginx.init
Merge branch 'upstream'
nginx (1:1.2.3-1bbox1) precise; urgency=low

  * New upstream release, 1.2.3
  * New upstream version of Passenger, 3.0.17
Fixed version, urgency. Do not change version without importing pristine tar :)
Imported Upstream version 1.2.4
Merge tag 'upstream/1.2.4'

Upstream version 1.2.4
Changed /var/run to /run in multiple files.
Changed version number.
Merge branch 'master' of git+ssh://git.debian.org/git/collab-maint/nginx
Updating naxsi version.
Fixed long changelog