Merge branch 'MDL-49776-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 May 2015 10:53:34 +0000 (11:53 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 26 May 2015 10:53:34 +0000 (11:53 +0100)
commit450b0f1dfdc77d2aa9be1bccc53588b833b927d8
treec8b07877062f97efaa2edc66b93e0375823679cd
parentaa55e703828c59bdc8a04f34373ff889d12ab8f4
parent058cd1c1d001f90fb19acf7b1fc785260516b277
Merge branch 'MDL-49776-master' of git://github.com/lameze/moodle