Merge branch 'tests'
authorColeman Watts <coleman@civicrm.org>
Wed, 30 Apr 2014 00:14:32 +0000 (17:14 -0700)
committerColeman Watts <coleman@civicrm.org>
Wed, 30 Apr 2014 00:14:32 +0000 (17:14 -0700)
commit2267620ce5589991a42398def7e39b5e012946e9
tree371d0d11f3878100bfc03c056b820a7652ee9301
parenta4789ebac58a53415eebccefe7b608efae5a5e09
parent6795600da483c5dfeec4474336436a29ad0f27f8
Merge branch 'tests'

Conflicts:
CRM/Core/SelectValues.php