Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle
commited34ab47e1ea2a69d8582ec290182f3d96d4812a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Nov 2014 16:40:50 +0000 (6 17:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Nov 2014 16:40:50 +0000 (6 17:40 +0100)
treecb42477e21404b2ece194c87decfc08b3b9dd727
parenta211c543886b585db77a92409148e8b6dae384cd
parentf7dd19f01d97784e490adbc739730c0bafdf3bad
Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle