TeleSign/java_telesign — pull request #3 by cjboorman (2013-03-17 04:23:07+00:00)
Title: Merged with John's updates

git fetch upstream
git merge upstream/master

I picked up John's latest bits.

Merged:

● src/com/telesign/phoneid/PhoneId.java
● src/com/telesign/util/TeleSignRequest.java
● src/com/telesign/verify/Verify.java

Resolved conflicts by:

- removing all of the compiled Javadoc *.html files.
- running three-way merges with:

● src/com/telesign/phoneid/PhoneId.java
● src/com/telesign/util/TeleSignRequest.java
● src/com/telesign/verify/Verify.java