Merge branch '2525-java-sdk'
authorradhika <radhika@curoverse.com>
Thu, 8 May 2014 20:40:48 +0000 (16:40 -0400)
committerradhika <radhika@curoverse.com>
Thu, 8 May 2014 20:40:48 +0000 (16:40 -0400)

Trivial merge