Merge branch 'master' into develop

This commit is contained in:
akasima 2014-07-21 12:34:33 +09:00
commit d24ff73619
2 changed files with 2 additions and 2 deletions

View file

@ -165,7 +165,7 @@ class Object
}
/**
* Method to retrieve an object containing a key/value paris
* Method to retrieve an object containing a key/value pairs
*
* @return Object Returns an object containing key/value pairs
*/