Merge branch 'MDL-52814_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE
commit29e70c0ffa959b4985a201fedacfdc975dbd71d3
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 15:48:59 +0000 (16 16:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 15:48:59 +0000 (16 16:48 +0100)
treeb4b07dd5f702697d3c401ef6caf75b7fd7a214b5
parenta8615c22c8bc203630b1521d83dc6821e9c4fd43
parent4b3f09c081dd1f5d493a12a429598a9f4a253896
Merge branch 'MDL-52814_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE