Merge branch 'hotfix/105'
authorMatthew Weier O'Phinney <matthew@zend.com>
Wed, 3 Oct 2012 20:31:29 +0000 (15:31 -0500)
committerMatthew Weier O'Phinney <matthew@zend.com>
Wed, 3 Oct 2012 20:31:29 +0000 (15:31 -0500)
Close #105


Trivial merge