Merge pull request #1683 from bendiy/4_6_x
authorLinda Nichols <lynnaloo@gmail.com>
Fri, 18 Jul 2014 21:31:17 +0000 (17:31 -0400)
committerLinda Nichols <lynnaloo@gmail.com>
Fri, 18 Jul 2014 21:31:17 +0000 (17:31 -0400)
Allow both JWT grant types.


Trivial merge