Merge branch 'MDL-41258-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE
commit6480ec0c485bf614746011c6eb83f62cccfa17c0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 18:10:48 +0000 (24 20:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 18:10:48 +0000 (24 20:10 +0200)
treea43767ea1c8cb13663ee399518306319fe14d10f
parent1e4e4a05d7c7ff13584ee326e714258363e0a7b2
parenta0f39f2b57f75150844d28e37692ff7c30e69068
Merge branch 'MDL-41258-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE