Merge branch 'master' into contactsmanager-register

Conflicts:
	lib/private/contactsmanager.php

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/private/contactsmanager.php b/lib/private/contactsmanager.php
index 8cfbb3da9f6..338cc048651 100644
--- a/lib/private/contactsmanager.php
+++ b/lib/private/contactsmanager.php
@@ -31,7 +31,7 @@ namespace OC {
 		 * @param string $pattern which should match within the $searchProperties
 		 * @param array $searchProperties defines the properties within the query pattern should match
 		 * @param array $options - for future use. One should always have options!
-		 * @return array of contacts which are arrays of key-value-pairs
+		 * @return array an array of contacts which are arrays of key-value-pairs
 		 */
 		public function search($pattern, $searchProperties = array(), $options = array()) {
 			$this->loadAddressBooks();