From: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date: Thu, 19 Mar 2015 08:36:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 0.6~60
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=c9357a8edfe6d047da95b85c5f3c18b9db40d172;p=st.git

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

c9357a8edfe6d047da95b85c5f3c18b9db40d172