Merge branch 'MDL-47712-master' of git://github.com/dthies/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 02:33:14 +0000 (10:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 02:33:14 +0000 (10:33 +0800)

Trivial merge