cqmaker ok
Merge branch 'unity' of ssh://github.com/tqchen/xgboost into unity

Conflicts:
	src/tree/updater_histmaker-inl.hpp