Merge branch 'MDL-55134-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 00:53:58 +0000 (02:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 00:53:58 +0000 (02:53 +0200)
commitf71eaa794d8f8fde073b0d3bc913ccce55076ff9
tree78f7c73a1f5963524abc4e26979e4e0663dc8939
parentb76edf3cfa81444c4b36d73b412acbf94f5c46ba
parentd3a93557d574fa283453f09a89ecd0b045e81279
Merge branch 'MDL-55134-master' of git://github.com/danpoltawski/moodle