chebfun/chebfun — pull request #1050 by nickhale (2014-07-15 08:01:40+00:00)
Title: Fix chebfun merge

Closes #990.