private.xml
Merge branch 'master' of https://github.com/hoangkianh/BlackpointsTrafficServer

Conflicts:
	nbproject/private/private.xml