Merge branch 'MDL-49032' of https://github.com/stronk7/moodle
commit11fa8ca7601b0369eb71a0a3c723df62e609ec2c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 23:00:03 +0000 (16 01:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 23:00:03 +0000 (16 01:00 +0200)
tree56639b65ed36b0ffd569789f28df3044bb4af746
parenta9285cd5d4d9c49967f5ba3480b646165df7d431
parent6aa00dadc6dc439be7287c3230922a73d50cfcc6
Merge branch 'MDL-49032' of https://github.com/stronk7/moodle