Merge branch 'MDL-58708-master' of git://github.com/jleyva/moodle
commitd40c8844a13c5ee8026c621d20d2442d8d5b7a32
authorDavid Monllao <davidm@moodle.com>
Thu, 27 Apr 2017 04:07:21 +0000 (27 12:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 27 Apr 2017 04:07:21 +0000 (27 12:07 +0800)
treeb0965dd2722f8053ddcad7ee81d0d91ef78935b3
parent160c263da571f9672c7255b2e930e53d98faeb2a
parente7a11c20d6da094071a3baf86f76e7676f4ad061
Merge branch 'MDL-58708-master' of git://github.com/jleyva/moodle