Merge branch 'MDL-54838-master' of https://github.com/nashtechdev01/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 23 Aug 2016 04:42:52 +0000 (12:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 23 Aug 2016 04:42:52 +0000 (12:42 +0800)
commitbab59f1c08896c3433b55ea8bff32711876edfbe
tree5b8d9d61a3df6f9cde37936326a4f192f28d6be2
parent080f292ed74e0bc1283062e088c86fc819257f80
parentd0207fdc06236283490913119de805c3c06e6058
Merge branch 'MDL-54838-master' of https://github.com/nashtechdev01/moodle