Merge remote-tracking branch 'bernardo/3.18.05-translate' into 3.18.x
commit12eda938a1e58b0a0f477b2a7e26c8f2dd93ff3a
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 22 Mar 2015 05:32:45 +0000 (22 18:32 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 22 Mar 2015 05:32:45 +0000 (22 18:32 +1300)
tree8243584ebacc8644edbf0b6f89e8448f15e6a0d4
parentab60b4a60b2f890a126ac5254f2d7948ee366b53
parent8b46552287e884fcab97717e78541672916242ba
Merge remote-tracking branch 'bernardo/3.18.05-translate' into 3.18.x