Merge branch 'MDL-52371-Activity-Chooser-alignment-of-strings-that-need-line-wrap...
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 03:36:54 +0000 (11:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 03:36:54 +0000 (11:36 +0800)

Trivial merge