Merge branch 'MDL-48456-master' of git://github.com/dkns/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 07:14:58 +0000 (15:14 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 07:14:58 +0000 (15:14 +0800)

Trivial merge