Merge branch 'MDL-56090-master-fix' of github.com:andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2016 08:38:36 +0000 (10:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2016 08:38:36 +0000 (10:38 +0200)
commitc64230234f93dd4033910f6f4132b6894ffb0818
tree33193225628f5a98f5336825933011c266b4214a
parent01435b4ebded4230360612dd39adae9a978987b2
parentebc746dcc29d2e1d9dfdd79f4161975243b1d0a8
Merge branch 'MDL-56090-master-fix' of github.com:andrewnicols/moodle