Merge branch 'wip-MDL-47079-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Sep 2014 15:57:19 +0000 (17:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Sep 2014 15:57:19 +0000 (17:57 +0200)
commitd3921f07b8def4f4187fd0d107be663a6d906259
treea4b40e9e79304be547a2403add914a2028f67d50
parentac7fac558ee0e4ef12eacc9200a7512573cdda1c
parentea80c29a2cbe36384a4e460230eeb2ccff200dd6
Merge branch 'wip-MDL-47079-master' of git://github.com/marinaglancy/moodle