upstream/1.3.99.git20120610

Samuel Thibault

@sthibault

24fdfed0 · Merge remote-tracking branch 'upstream/master' into upstream · Jun 10, 2012

New upstream snapshot