Merge branch 'rcsheets-docstring-cleanup'

Conflicts:
	CRM/Utils/Array.php

diff --cc CRM/Utils/Api.php
Simple merge

diff --cc CRM/Utils/Array.php
index 648ca4153b424f614209e5e8c2924eccce62c8c8,86b2badd72f86df18126a0c54879a104c77af7db..458d45d9935aeae4df36e140d0497f401ce7c4b8
--- 1/CRM/Utils/Array.php
--- 2/CRM/Utils/Array.php
+++ b/CRM/Utils/Array.php
@@@ -26,6 -26,7 +26,7 @@@
  */
  
  /**
 - * Provides a ollection of static methods for array manipulation.
++ * Provides a collection of static methods for array manipulation.
   *
   * @package CRM
   * @copyright CiviCRM LLC (c) 2004-2014

diff --cc CRM/Utils/Constant.php
Simple merge

diff --cc CRM/Utils/Crypt.php
Simple merge