samba locking params
Merge branch 'master' of github.com:Eugeny/reconfigure

Conflicts:
	reconfigure/__init__.py