Merge branch 'master' into terencehill/translation_system_improvements_2
authorterencehill <piuntn@gmail.com>
Tue, 1 Sep 2015 09:19:46 +0000 (11:19 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 1 Sep 2015 09:19:46 +0000 (11:19 +0200)
commit749fa0b4d14a84b1dea852b496bbd11f1a631a1f
tree255f1e208e754502685843d2b0c7025a88a83a3b
parent473ffbade612c2abc9dbc1616a26b264eea3390a
parentb822740ca8df332014ffcb6c62d3aee87f636925
Merge branch 'master' into terencehill/translation_system_improvements_2