Merge branch 'rcsheets-docstring-cleanup'
authorColeman Watts <coleman@civicrm.org>
Tue, 1 Apr 2014 17:06:57 +0000 (13:06 -0400)
committerColeman Watts <coleman@civicrm.org>
Tue, 1 Apr 2014 17:06:57 +0000 (13:06 -0400)
commitac30252393b3b9d8162994f59bb63e2b89ddacdc
tree348d06c4cbbe4079442394c20a18d7104a62a5e1
parent6939fb538aa1d78ed76658f95fcc2c3686a49283
parentd65b58305e0cc78b3a3f169d8ab4237a58d7df0b
Merge branch 'rcsheets-docstring-cleanup'

Conflicts:
CRM/Utils/Array.php
CRM/Utils/Api.php
CRM/Utils/Array.php
CRM/Utils/Constant.php
CRM/Utils/Crypt.php