From: David Martínez <contacto@davidmartinez.net>
Date: Sun, 27 Mar 2016 09:25:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into tesseract
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/27ce01e83bf0264b9aed9595226ef84f07ca0f52

Merge remote-tracking branch 'upstream/master' into tesseract
---

27ce01e83bf0264b9aed9595226ef84f07ca0f52