cakephp/cakephp — pull request #3426 by thinkingmedia (2014-04-30 20:09:57+00:00)
Title: Grammar fixes

@return will accept the `|` or operator to define multiple return types. Don't use the word `or`.