Merge branch 'wip_MDL-50869_master' of git://github.com/gjb2048/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 26 Aug 2015 01:44:21 +0000 (09:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 26 Aug 2015 01:44:21 +0000 (09:44 +0800)
commit6ddfb278d2ba0fecf356429c7f92a1f3924d059d
tree575b225d428fde28b565c7c2209c3890f80fbdba
parent55a8e8680743acd3e7b2e73a63a2e0f4e3a1db98
parent267c6367028576c92a6ade6e3ae3a8e5d5b1c3c3
Merge branch 'wip_MDL-50869_master' of git://github.com/gjb2048/moodle