Merge remote-tracking branch 'origin/master'
# Conflicts:
#	pom.xml
commit 80e687a9a66c5c4717aad3efa770b8cd779f0631
2 parents bb1508a + e4e488d
@Dmitriy T. Dmitriy T. authored on 21 Nov
Showing 1 changed file
View
pom.xml