tree 4a55048d6b299aa4738b458b0ad8fb30e0447ec3
parent e0c0b241f966e2116c1d941041b01807201fbea8
parent 8c898e78f657ce34e1af3f1777478f5f3855a8a6
author Josh Elser <josh.elser@gmail.com> 1381272630 -0400
committer Josh Elser <josh.elser@gmail.com> 1381272630 -0400

Merge branch '1.5'

Conflicts:
	pom.xml