Merge branch 'MDL-49931-master' of git://github.com/ankitagarwal/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2015 04:25:56 +0000 (12:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2015 04:25:56 +0000 (12:25 +0800)

Trivial merge