Merge branch 'MDL-50637' of git://github.com/sk-unikent/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 05:56:18 +0000 (13:56 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 05:56:18 +0000 (13:56 +0800)

Trivial merge