Merge remote-tracking branch 'upstream/master' into tesseract
authorDavid Martínez <contacto@davidmartinez.net>
Sun, 27 Mar 2016 09:25:15 +0000 (11:25 +0200)
committerDavid Martínez <contacto@davidmartinez.net>
Sun, 27 Mar 2016 09:25:15 +0000 (11:25 +0200)
commit27ce01e83bf0264b9aed9595226ef84f07ca0f52
tree36790b75758b98cbecefc31df1762e2edd77156d
parent2225c1f45a6d0b1cb9e9b43f65cbf6e3c54cfdd2
parent216acc0654fda514284b7efb15d3f7efdcef1098
Merge remote-tracking branch 'upstream/master' into tesseract