Jessie Frazelle e646feca25 Merge pull request #9345 from jfrazelle/bump_v1.4.0 ... Bump version to 1.4.0		2014-12-11 16:31:29 -08:00
docs	Merge branch master into bump_v1.4.0	2014-12-11 15:00:03 -08:00