Merge branch 'MDL-50920' of git://github.com/sk-unikent/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Sep 2015 00:44:36 +0000 (08:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 2 Sep 2015 00:44:36 +0000 (08:44 +0800)

Trivial merge