Merge branch 'MDL-46079-m26' of https://github.com/sammarshallou/moodle into MOODLE_2...
commit9d5a2e6f1c419ed2325d44e2d01bc3867e59f04e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 23:34:02 +0000 (25 01:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 23:34:02 +0000 (25 01:34 +0200)
tree70f93d3d2bb41f4c17fc9e383aa28cd9777251be
parent004659a6d0988a75c3d68943487cd88866f99837
parentd20d8938a71d34ba4806b6c3ae5b8cd11ba03fe0
Merge branch 'MDL-46079-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE