Merge branch 'MDL-45970_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
commitd7b83310a7ca3e8528f1ea339b5c800683325213
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jun 2014 23:15:54 +0000 (17 01:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jun 2014 23:15:54 +0000 (17 01:15 +0200)
tree7310c3706232396b7c02c1604dbed0a85166b44b
parenta25529102c993341ba703cd3e17ef78a7fd7af08
parentfa5cfedf4e3d107959376f873fb19957961f2f26
Merge branch 'MDL-45970_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE