Merge branch 'MDL-31989_admin-performance' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 24 Feb 2016 03:05:41 +0000 (11:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 24 Feb 2016 03:05:41 +0000 (11:05 +0800)

Trivial merge