Merge branch 'MDL-48881_m30v5' of git://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 16 Sep 2015 05:20:52 +0000 (13:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 16 Sep 2015 05:20:52 +0000 (13:20 +0800)
commit48cec36dfb0fd3fd44dbee97fdcd28da1d3263ff
tree619779aa9a22f50ef1730336c7cd56dbb87348e5
parent13a2aff3f99b3c7642841500bdf7a18d187949f4
parent0a3c1f79caa988a01454f3c6291e4761226e90fc
Merge branch 'MDL-48881_m30v5' of git://github.com/sbourget/moodle