Merge branch 'MDL-49205_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
commit98e374b38f3460e4694f0778916c9479a77e4462
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 21:19:04 +0000 (17 22:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 21:19:04 +0000 (17 22:19 +0100)
tree4f32e41043152a75264c46501da5fee8afc6536e
parentedbe1e67f1f064f51b75433a1b179d3b21e51927
parent2a7241b3a193b8af6debf44ee906af757d34d4df
Merge branch 'MDL-49205_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE