Merge tag 'v1.0.5.RELEASE' into 1.0.x

[artifactory-release] Release version 1.0.5.RELEASE

Conflicts:
	gradle.properties
This commit is contained in:
Jennifer Hickey
2013-07-01 13:40:47 -07:00

Diff Content Not Available