Merge branch 'MDL-57357-master' of https://github.com/snake/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 28 Dec 2016 10:15:29 +0000 (11:15 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 28 Dec 2016 10:15:29 +0000 (11:15 +0100)

Trivial merge