Scott Mitchell 6daf324636 c7e3f6c6fd merge error ... Motivation: Cherry-pick of c7e3f6c6fd went wrong. Modifications: - Fix comiple error Result: Build completes.		2015-09-16 15:41:17 -07:00
..
src	c7e3f6c6fd merge error	2015-09-16 15:41:17 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2015-03-03 08:30:59 -05:00