Merge remote-tracking branch 'bernardo/3.18.03-translate' into 3.18.x v3.18.03
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 22 Jan 2015 20:01:05 +0000 (09:01 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 22 Jan 2015 20:01:05 +0000 (09:01 +1300)
commitc344e2e46a0e1de241b2806b60f3ea86c87eb7b1
tree821cce25471a2cf9f87e172e81c582892bfa5917
parentb8573a838bd0c3b7327d08c164f8ac8337109762
parent9cbc005cf3ea87fd0399795fe986d90e2e2b865e
Merge remote-tracking branch 'bernardo/3.18.03-translate' into 3.18.x