On Mon, Sep 01, 2014 at 07:31:41PM -0700, Brian Dolbec wrote:
> Conflicts:
> 	targets/support/functions.sh

Presumably these are conflicts from rebasing from 3.0.  I don't think
we care about those, so I'd remove this note from the commit message.

What are the symptoms of the bug this fixes?  How do I trigger it in
Catalysts without this patch?

Cheers,
Trevor

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy