Merge branch 'MDL-54576_themeSelector' of https://github.com/mrmark/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jun 2016 03:24:00 +0000 (11:24 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:06 +0000 (09:04 +0100)

Trivial merge