Merge branch 'master' into terencehill/translate_colors_2 290/head
authorterencehill <piuntn@gmail.com>
Sun, 1 May 2016 10:48:52 +0000 (12:48 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 1 May 2016 10:48:52 +0000 (12:48 +0200)
commitbf28c62f9ad2f130024109354c2503457195898d
tree447329dd5f1e8d0d67d6aa124c35c1ca045fdfa1
parentd271f27a5ac351a3a7b39636932f6d661492be1d
parentc914a05e8e91853fe003d7d03b1f3ddbf0881f39
Merge branch 'master' into terencehill/translate_colors_2