Merge branch 'MDL-42835-26' of http://github.com/damyon/moodle into MOODLE_26_STABLE
commite17dc7bcfaa0d20491500524eb5904cc0fd29ae2
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 12 Jun 2014 08:00:01 +0000 (12 10:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 12 Jun 2014 08:00:01 +0000 (12 10:00 +0200)
tree19e9e365d01dd46898c9d15d5db111146e1ebbd1
parent6e5c445714cacce065e575bd541968f5258c5160
parent95ef465948064febc15f4d5d4caed921538ccd25
Merge branch 'MDL-42835-26' of github.com/damyon/moodle into MOODLE_26_STABLE