Merge branch 'MDL-53796_30' of git://github.com/dmonllao/moodle into MOODLE_30_STABLE
commit1491aca61d791750e14d4e4565190396176fa1a4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Apr 2016 23:58:36 +0000 (19 01:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Apr 2016 23:58:36 +0000 (19 01:58 +0200)
treef1cde0984ec2d9f333b0090311d0da67c28ed12b
parent0fd01700f4eedb490cfd2b4f278f30423dd36a79
parent306561a926cfacd73b1bc88093bd11c8b822bbd6
Merge branch 'MDL-53796_30' of git://github.com/dmonllao/moodle into MOODLE_30_STABLE