Merge branch 'MDL-47180' of git://github.com/jmvedrine/moodle
commitd50a73309bcc579653529dddbe9b1566ed1d1a17
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Sep 2014 22:40:40 +0000 (24 00:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Sep 2014 22:40:40 +0000 (24 00:40 +0200)
treeac7224c994d3fb8f964fa5f3ea7b91adc1d463fc
parent4bcf64b053a4bb346115db46d73cdeac1b8947a4
parent129f3c51901396746fe54371ae16f79922600690
Merge branch 'MDL-47180' of git://github.com/jmvedrine/moodle