From: Naffanya <naffanya@naffanya.(none)>
Date: Mon, 17 Mar 2014 21:08:43 +0000 (+0200)
Subject: Merge branch 'master' into naffanya-dev
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/69aaa0bd928ece0837c8e88441c80f1f8cf1fe38

Merge branch 'master' into naffanya-dev
---

69aaa0bd928ece0837c8e88441c80f1f8cf1fe38