Merge branch 'MDL-51408-master' of git://github.com/marinaglancy/moodle
commitfe73503248efb710c4b1214d8bc72c15361f5376
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 05:49:00 +0000 (5 13:49 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 05:49:00 +0000 (5 13:49 +0800)
tree73e4562187d6fd764e83004c950b35e03191b0f6
parentb0fca9208b294eb086349a49f5c29deb46d208ae
parent4f2424ca1cc9d5cc840d7500560adb669255bb2b
Merge branch 'MDL-51408-master' of git://github.com/marinaglancy/moodle