Merge branch 'uk-english'
authorColin Fletcher <colin.m.fletcher@googlemail.com>
Fri, 10 Apr 2015 17:25:58 +0000 (18:25 +0100)
committerColin Fletcher <colin.m.fletcher@googlemail.com>
Fri, 10 Apr 2015 17:25:58 +0000 (18:25 +0100)
commit30d95bbb8c007bf4db96dff86eea9eff6c5eeab1
tree899cdf2863499882d13234299e213f570f237714
parent6c93bcc64f25509aab76b1a17760795cf092c2b7
parentc38c486936e0cb2ed5573028ba35f95b6cfa13a5
Merge branch 'uk-english'

Merge the UK English localisation.