test git
Merge remote-tracking branch 'origin/HEAD'

Conflicts:
	src/com/galebo/nginx/plugin/ModuleDialog.java