Merge branch 'MDL-50207-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Sep 2015 18:05:10 +0000 (20:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Sep 2015 13:38:19 +0000 (15:38 +0200)
commit02be8a042727f76f08f9ca6dd76c8775b18eb9de
tree3ca24e329dcdce13bb2b7f793fa5fa9a3e275ef9
parente99b197e9754c89ffa5c27ef8dbc4cd28dc8ee00
parenteb8010351c90b2a3829a4437563e2ad4b3225fcc
Merge branch 'MDL-50207-master' of git://github.com/lameze/moodle