]> git.stg.codes - stg.git/commitdiff
Merge branch 'master' into naffanya-dev
authorNaffanya <naffanya@naffanya.(none)>
Thu, 10 Apr 2014 00:39:50 +0000 (03:39 +0300)
committerNaffanya <naffanya@naffanya.(none)>
Thu, 10 Apr 2014 00:39:50 +0000 (03:39 +0300)

Trivial merge