Checkout
Joe Orton
committed
on 20 Mar
Merge r1875471, r1875472 from trunk:

Fix Travis trunk/master confusion, and make the i386 build
trunk-only, it has not been adjusted to fin… Show more
Merge r1875471, r1875472 from trunk:

Fix Travis trunk/master confusion, and make the i386 build

trunk-only, it has not been adjusted to find PCRE "v1" i386 packages.

Fix the travis syntax (should have done it in a PR...).

Show less