From: Robert Valik <valik@visitors.sk>
Date: Sun, 18 Oct 2015 11:46:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/c744753ef5e98040b5311ba774d164f1bbea80f2

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

c744753ef5e98040b5311ba774d164f1bbea80f2