Merge branch 'MDL-54849-master' of git://github.com/damyon/moodle
commit3e7d5a82b9d93d5b4982dec01b2c627d6f965987
authorDavid Monllao <davidm@moodle.com>
Thu, 27 Apr 2017 03:20:02 +0000 (27 11:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 27 Apr 2017 03:20:02 +0000 (27 11:20 +0800)
tree781893248ea492586dcad417737d735146befe9e
parentf539dc3aa536f96edd7c1bd0503091da02150ea0
parentff8a1930adbe4cdee55238a50ccb39329f82ef68
Merge branch 'MDL-54849-master' of git://github.com/damyon/moodle