cybergarage/CyberLink4Java — pull request #3 by timmattison (2013-04-05 13:21:04+00:00)
Title: Fix pom merge conflicts

Fixed those pom merge conflicts in https://github.com/cybergarage/CyberLink4Java/issues/1