No idea what I have here but it's ok
Merge branch 'master' of github:baabelfish/luabinds

Conflicts:
	src/helpers.hpp