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


Trivial merge