Merge branch 'wip_MDL-50659_master' of git://github.com/gjb2048/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Jun 2015 03:45:02 +0000 (11:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 29 Jun 2015 03:45:02 +0000 (11:45 +0800)
commit5324a7202a86094feba63d406df960a97d205d9f
tree4cba8787b05413cc7cdb7edb22cb42eb99587165
parentfd36588fb6ca0eb6b9836f301ace13a610f1f3ab
parent8576569f14e6221544cfbb466502e09446011fb5
Merge branch 'wip_MDL-50659_master' of git://github.com/gjb2048/moodle