Merge branch 'MDL-31262' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 01:18:05 +0000 (03:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 01:18:05 +0000 (03:18 +0200)
commit2e20fc3742cf9312c71b9e24c020543406d071e5
tree0b4a7fc4d5ce853bd445627de038aefa4cbff37c
parentcc7c745c7d58b4620eace94ed26df6297b0c56ab
parent6a981b45c354a08cddbbbbc803c0aed87d657a9e
Merge branch 'MDL-31262' of git://github.com/timhunt/moodle