Merge branch 'master' into terencehill/translate_colors_2
authorterencehill <piuntn@gmail.com>
Sun, 27 Mar 2016 17:43:20 +0000 (19:43 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 27 Mar 2016 17:43:20 +0000 (19:43 +0200)
commitd271f27a5ac351a3a7b39636932f6d661492be1d
tree0cb04c1f8758b4c78644f0a9a0ea33f36fe353c1
parent92749b51e06f4fd2a89d7593a9db7500818ad2fd
parentb34c9928b7ffaa29800572dc7d5c78e3b6427cc5
Merge branch 'master' into terencehill/translate_colors_2