Merge branch 'MDL-45418' of git://github.com/stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jun 2014 18:12:58 +0000 (20:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jun 2014 18:12:58 +0000 (20:12 +0200)
commited16bf372431ef42aee698202c6d06b18fee5ad0
treeac31b389f853fb4aca960bf5cf29e2f3bf96db3e
parent5adb8d86bd98cb2338824e87d960f9e0500aeb10
parent1e2e5d83e9aeceb93c341d2eb76499dd1018a48e
Merge branch 'MDL-45418' of git://github.com/stronk7/moodle