Merge branch 'MDL-58177-master' of https://github.com/sammarshallou/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 28 Mar 2017 21:16:42 +0000 (23:16 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 28 Mar 2017 21:16:42 +0000 (23:16 +0200)

Trivial merge