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

Trivial merge