From: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date: Thu, 23 Apr 2015 15:59:39 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.xinqibao.xyz/st.git/commitdiff_plain/f36dd277a2e71e99624fe26365757242d56259c0?ds=inline;hp=--cc

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

f36dd277a2e71e99624fe26365757242d56259c0