Merge branch 'MDL-38230' of git://github.com/jmvedrine/moodle
commitf72a201884e57d8a7fd84aaff02cf99619f227f4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 10:38:51 +0000 (5 12:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 10:38:51 +0000 (5 12:38 +0200)
treeadc51e2006717bd7d433fa5a973f0bad44ba90c7
parentb167057c8a58367ebf7601779102142e3b68016d
parenta001c1131e78de4a2fc18cff7903d266f3df4a06
Merge branch 'MDL-38230' of git://github.com/jmvedrine/moodle