Merge branch 'master' into terencehill/translation_system_improvements_2
authorterencehill <piuntn@gmail.com>
Sat, 5 Sep 2015 12:10:22 +0000 (14:10 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 5 Sep 2015 12:10:22 +0000 (14:10 +0200)
commit18302817d7f0cb0ba74398200da5e400ffc1b9a4
tree26918e579ede7cd7b965f1b8480d564cb4fe983d
parent59ec12d3ed49caeaf6bf57d4a196ae88a9dd1dfc
parenta240e0309a8ec5837f3ac3d37c168f5262e53d5b
Merge branch 'master' into terencehill/translation_system_improvements_2