Merge branch 'MDL-53904-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 09:16:27 +0000 (10:16 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 09:16:27 +0000 (10:16 +0100)
commit1019a8f1cac4fe5661f550ac22a61c2f3fea1757
tree40c0816df60c0334a72897429ee339a9cab35a16
parent3b846632d1dc7784063e96145adea7d913b7c00c
parentf6b9b6b71b4b496643e3febda0260b52482529e9
Merge branch 'MDL-53904-master' of git://github.com/marinaglancy/moodle