tree 50b129ad5a6a8f262ddffab52f78c9aecd52e5a7
parent 0c77dae9020a798eabd3748ce44685be4fc3ebfd
parent 2a6f2fc9d522fd71cd95d576cdbcf5d4f6b395bf
author Josh Elser <josh.elser@gmail.com> 1381272539 -0400
committer Josh Elser <josh.elser@gmail.com> 1381272539 -0400

Merge branch '1.4' into 1.5

Conflicts:
	pom.xml