[hackers] [st] Merge remote-tracking branch 'origin/master' || Roberto E. Vargas Caballero

[git]

commit f36dd277a2e71e99624fe26365757242d56259c0
Merge: 0d7448d 89807ed
Author: Roberto E. Vargas Caballero <k...@shike2.com>
Date:   Thu Apr 23 17:59:39 2015 +0200

    Merge remote-tracking branch 'origin/master'