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


Trivial merge