Merge branch 'MDL-56999-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 01:31:07 +0000 (09:31 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 01:31:07 +0000 (09:31 +0800)
commita813b0c3dc73e16cff5bf426af67ee5cddae593f
treeee92e85b48bb66a9b77b8a588d60462c51f1c0bb
parent84c8c009594e7e367fd2fb1b42c30bf3d22b656a
parent3eb9cc2f6ea180a6bb8ac8cd709151b3d14c036c
Merge branch 'MDL-56999-master' of git://github.com/damyon/moodle