Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-10-14-11-16-10

[civicrm-core.git] / CRM / Core / BAO / Extension.php

diff --git a/CRM/Core/BAO/Extension.php b/CRM/Core/BAO/Extension.php
index dfac8653d685bb0ad424eea5cc7d6c4ca7c349f5..81d902a627c2c55d03b388e290fcd0e88aa022f7 100644 (file)
--- a/CRM/Core/BAO/Extension.php
+++ b/CRM/Core/BAO/Extension.php
@@ -49,7 +49,7 @@ class CRM_Core_BAO_Extension extends CRM_Core_DAO_Extension {
    * @param array $params   (reference ) an assoc array of name/value pairs
    * @param array $defaults (reference ) an assoc array to hold the flattened values
    *
-   * @return object CRM_Core_BAO_LocaationType object on success, null otherwise
+   * @return object CRM_Core_BAO_LocationType object on success, null otherwise
    * @access public
    * @static
    */