Merge branch 'MDL-41216' of https://github.com/nobelium/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Mar 2014 00:23:08 +0000 (01:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Mar 2014 00:23:08 +0000 (01:23 +0100)
commitb9add57766b3b53796cc03a04f1880bffa9f9424
tree9f983bd9b9b6653c36eaeb83d8d77e81f9fb4653
parenta4627988fd9f79648ebbf3eb3631fb31fb8a532f
parentb4f71f0c102ed8243777aeb0f9d714fcfb67cb6b
Merge branch 'MDL-41216' of https://github.com/nobelium/moodle