Merge branch 'MDL-56843-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Nov 2016 00:48:22 +0000 (08:48 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Nov 2016 00:48:22 +0000 (08:48 +0800)
commitff687b9c150788c9ccd9ee7efede65771a8b0d30
treee7310180e2307bd6a34cd09173c9e3bc9feda1e0
parentb0db945b112028727dfc8a7e297dd47b5beae8fa
parentb95a05a536b3022b48c7702ae00b1a7f134e1ae0
Merge branch 'MDL-56843-master' of git://github.com/lameze/moodle