From: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date: Tue, 4 Feb 2014 10:46:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 0.5~14
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=315b7ee9ce13603339104cab0402d7d6c10e92b8;p=st.git

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

315b7ee9ce13603339104cab0402d7d6c10e92b8