Merge branch 'MDL-52788-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 16 Mar 2016 06:47:07 +0000 (14:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 16 Mar 2016 06:47:07 +0000 (14:47 +0800)
commit94ffadcdcd2adf2cbae310c43dcdab6c63891ad2
treee3a0022117ed1afb0236f434607d9ff0df06cc61
parent3e9cf4f941b66e4e7d2c9a1c3fecf59f4339a099
parentb89544404e7d847b2c60250ef8a5deb0af2b5e68
Merge branch 'MDL-52788-master' of git://github.com/jleyva/moodle