Merge branch 'MDL-49145_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Feb 2015 01:05:34 +0000 (09:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Feb 2015 01:05:34 +0000 (09:05 +0800)

Trivial merge