Merge branch 'MDL-51057-M30' of git://github.com/lazydaisy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 01:53:21 +0000 (09:53 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 01:53:21 +0000 (09:53 +0800)

Trivial merge