Merge branch 'MDL-50332_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 07:43:02 +0000 (15:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 07:43:02 +0000 (15:43 +0800)

Trivial merge