Merge branch 'MDL-52071-master' of git://github.com/jleyva/moodle
commita0b972ac3c0418b663192282d2b2b33ca9d45caf
authorDavid Monllao <davidm@moodle.com>
Thu, 12 Nov 2015 23:47:58 +0000 (13 07:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 12 Nov 2015 23:47:58 +0000 (13 07:47 +0800)
treea8443a436b8aa47d0f86222606078395cdda3d63
parente763d96122dbcdf8a83df4cbc2cc6fa1777a8720
parentb8fbbc44d0af089338578c1ae135e2efca0bdf15
Merge branch 'MDL-52071-master' of git://github.com/jleyva/moodle