Merge branch 'MDL-49870-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 6 May 2015 07:30:31 +0000 (15:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 6 May 2015 07:30:31 +0000 (15:30 +0800)
commit52802cf6242536aa3640d7bd8c5ac19278d7a073
treeaf3fd354a128a0897a0199a74a3be7c7bfcc4d83
parent8b4568500b305f7ddedbca355b73ce34ea4afbc0
parent917bd02be5e47a49c3f653e4dae3f229fe354e93
Merge branch 'MDL-49870-master' of git://github.com/damyon/moodle