Merge branch 'MDL-53757_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 20 Apr 2016 07:52:57 +0000 (15:52 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 20 Apr 2016 07:52:57 +0000 (15:52 +0800)
commit6870e1fa77ccf0078b6e6990ab4a477ef62c8181
tree449df8b19ac37363689162a2f6a7cd3836d02f95
parenteb91deaa859b124dda69afb3f477987d7b558d22
parent7bdc3ba6e6e26c838ef9b715715a5c00a6920dad
Merge branch 'MDL-53757_master' of git://github.com/markn86/moodle