From: Tim Otten <totten@civicrm.org>
Date: Tue, 14 Jul 2015 07:05:53 +0000 (-0700)
Subject: Merge pull request #5520 from totten/4.6-cxn
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d29ca3ca2a0f5c800fa7142dc638fc61cad88bce;p=civicrm-core.git

Merge pull request #5520 from totten/4.6-cxn

CRM-16173 - System for simple, secure API keys
---

d29ca3ca2a0f5c800fa7142dc638fc61cad88bce