Merge branch 'MDL-56275-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE
commitf9d95d9ed9a57dca0247f9d6de73f133323c50ad
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 10:13:25 +0000 (18 12:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 10:13:25 +0000 (18 12:13 +0200)
treea7c4edb5cb62391323ad09ecac453d2dd37fb0a0
parent48bc44477d6b5e130d9ef9ab32b7ec2530a74f84
parent26bf3332773c45ac98d5a2fc5965edb4b5dadc73
Merge branch 'MDL-56275-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE