Merge branch 'MDL-51887-master' of git://github.com/dpalou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Mar 2016 03:17:40 +0000 (11:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Mar 2016 03:17:40 +0000 (11:17 +0800)

Trivial merge