Merge remote-tracking branch 'bernardo/16.11.15-translate-20180103' into 16.11.x
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 3 Jan 2018 19:21:37 +0000 (08:21 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 3 Jan 2018 19:21:37 +0000 (08:21 +1300)
commit7bded6a6a0bcb3273ac74ebcafaa8a3a3d1949d5
tree2d786b6b0c6d341c18ba1e81b1f889ea6f3ffd2c
parent3f29d5a0bf09a8758382fc4ad30fcdd14dcbac44
parentb8ba9d2ac802bb5bc8dbfa4713892e45055d2682
Merge remote-tracking branch 'bernardo/16.11.15-translate-20180103' into 16.11.x