Merge branch 'm30_MDL-51916' of https://github.com/danmarsden/moodle into MOODLE_30_S...
commit17af025b529b8f56f2aa8ea97a24134bd6e81b75
authorDan Poltawski <dan@moodle.com>
Tue, 22 Dec 2015 13:17:54 +0000 (22 13:17 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Dec 2015 13:17:54 +0000 (22 13:17 +0000)
treef32bbbaceb2d6fdfbacec6b16adb4b850f646184
parentac56855bbc0e439dbaae9da4f0ae087e885ef77d
parentf5f86a68ac266ca794eff0772207e7337fc3b30b
Merge branch 'm30_MDL-51916' of https://github.com/danmarsden/moodle into MOODLE_30_STABLE