Merge pull request #5520 from totten/4.6-cxn
authorTim Otten <totten@civicrm.org>
Tue, 14 Jul 2015 07:05:53 +0000 (00:05 -0700)
committerTim Otten <totten@civicrm.org>
Tue, 14 Jul 2015 07:05:53 +0000 (00:05 -0700)
CRM-16173 - System for simple, secure API keys


Trivial merge