Merge branch 'MDL-50136-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 May 2015 17:34:00 +0000 (19:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 May 2015 17:34:00 +0000 (19:34 +0200)
commit7a69b195968d2a3ca0a338c382d461fddcada955
tree00fba180743e51a4698162661ccb07f6a45b9534
parent88ffe4020f5eed63966c8debfeb298ba5c77c744
parent991efb8b1ad1f85e278674d0ad2f1634dff46fe7
Merge branch 'MDL-50136-master' of git://github.com/ankitagarwal/moodle