ACCUMULO-1166 Merge branch '1.5'
authorJosh Elser <elserj@rpi.edu>
Tue, 17 Sep 2013 21:48:11 +0000 (17:48 -0400)
committerJosh Elser <elserj@rpi.edu>
Tue, 17 Sep 2013 21:48:11 +0000 (17:48 -0400)
commit07f705921c2fa81543e920ef51a51dc7d2e3bfb6
tree5131647a95858976a7e15d11b8ca90489996c33e
parenteb4abac2a9c191e9e18c11812f9c6aa5ee7906b5
parent1e6f9d42f9604bcfa08c90828aa388752b717bb5
ACCUMULO-1166 Merge branch '1.5'

Conflicts:
pom.xml
src/main/resources/archetype-resources/pom.xml
pom.xml
src/main/resources/archetype-resources/pom.xml