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)
commite619d80e4c160f5ddfd6d1845d5861f3854eb581
treef3252a7913b7220e4f023f996120912cc36ea8df
parentd74feaa364a5552db7ab0b2727cb562727e921b9
parentf87fbac1a907800df169dae3ddc2445f8a618e08
Merge branch 'hotfix/132'

Close #132
Close #110