no message
Merge branch 'master' of https://github.com/sryohei/workspace

Conflicts:
	predict2/estimator.pyc
Merge branch 'master' of https://github.com/sryohei/workspace

Conflicts:
	predict2/estimator.pyc
	predict2/ipython_log.py
Merge branch 'master' of https://github.com/sryohei/workspace