Merge branch 'mdl36506-master' of git://github.com/tlock/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 Mar 2015 02:31:44 +0000 (10:31 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 Mar 2015 02:31:44 +0000 (10:31 +0800)

Trivial merge