Merge branch 'MDL-50277-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 May 2015 09:04:56 +0000 (11:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 May 2015 09:04:56 +0000 (11:04 +0200)
commit2e365978dec7b0a431111fc11ef9536627da216c
tree4d1fb5c3701884a3ea962475b9ddacbc70211eb9
parenta103ccb4a402170f78dfcc99454358298376cee7
parent4218673093b84c0b404856910bfb7361cf0cdd8c
Merge branch 'MDL-50277-master' of git://github.com/andrewnicols/moodle