Merge branch 'MDL-56527-master' of git://github.com/mudrd8mz/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 13:03:53 +0000 (14:03 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 13:03:53 +0000 (14:03 +0100)

Trivial merge