Merge branch 'MDL-51373-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 11:58:34 +0000 (13:58 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 11:58:34 +0000 (13:58 +0200)
commit728faf96c43177cd00ccc4342a0c3a9c07cf196c
tree77d32c714fc90c21c8901a99d2253cb2e3ea0249
parente2f79e330d1cd6c47b3195976c497333c7109aa5
parentaa7e371af620e333c8698bfe0833784016d35789
Merge branch 'MDL-51373-master' of git://github.com/jleyva/moodle