upstream/1.3.99.git20120710

Samuel Thibault

@sthibault

84cebe66 · Merge remote-tracking branch 'upstream/master' into upstream · Jul 10, 2012

New upstream snapshot