Merge branch 'MDL-53635-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 2 May 2016 07:38:11 +0000 (15:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 2 May 2016 07:38:11 +0000 (15:38 +0800)
commitd28f187c6f8c38a08ad34b23000f1d7bbbae27e3
tree8d6a83c2140390ac8f7b350f3470e1e66bf6baa7
parent2df5ede6356c77bb96d44575062cf2e332abcb9b
parent6d782e3383581eb1267256d8187107f05741bd15
Merge branch 'MDL-53635-master' of git://github.com/jleyva/moodle