Merge branch 'MDL-49240-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2015 00:11:16 +0000 (01:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2015 00:11:16 +0000 (01:11 +0100)
commitfbc4839a0ca8dfd307df88fa29897c9d972fa26d
tree34e8c08e7b4e1a9f8fa00dfc90f5ab2a48a483cb
parentcaa7022ed08b2cad7bd31840196ebad8cd2daaea
parentbef63c520c3d91baa5429cced41716246d6e3e69
Merge branch 'MDL-49240-master' of git://github.com/damyon/moodle