Merge branch 'MDL-40652_master' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:41:15 +0000 (00:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:41:15 +0000 (00:41 +0200)
commitf28051143f45c35afe33430e47df524a2207ae60
treeefd58493ae66b567110bffb52700f9f2f78bb39d
parent2be11851321a1397eaa2ec82150f6116fddcaae0
parent3ca6cd96653a61116bd34b8d6c13d1ce3e8524f1
Merge branch 'MDL-40652_master' of git://github.com/lazydaisy/moodle