Merge branch 'MDL-50959-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 21:36:14 +0000 (23:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 21:36:14 +0000 (23:36 +0200)
commit62652cdc6356fe88e9bf251e6df6b2fe682561b7
treea064d95d7fba012d9611b7f95f319e2130449367
parent4deecee44f67702160e752e2eb4d8d27865b2517
parente6c990ad21160152ec72c06445c15313bed19554
Merge branch 'MDL-50959-master' of git://github.com/lameze/moodle