Merge branch 'MDL-56640-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 20 Dec 2016 10:09:39 +0000 (11:09 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 20 Dec 2016 10:09:39 +0000 (11:09 +0100)

Trivial merge