Merge branch 'MDL-52284-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE
commite819a58b6e472e6de1001bd16e12712c355e09de
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Dec 2015 15:16:09 +0000 (10 16:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Dec 2015 15:16:09 +0000 (10 16:16 +0100)
tree9ca7f640350e704974a90237af24b5acbaa97fc0
parent2adbbcac0a98e3c3325bdca3b466ddfd9fa605b3
parent804a5f59ce802301b7c9c82b364e4192b83444c9
Merge branch 'MDL-52284-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE