Merge branch 'MDL-47990_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
commit2b463427665c7b384e8581a55c20896919d2a747
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 23:24:15 +0000 (6 00:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 23:24:15 +0000 (6 00:24 +0100)
tree08122fe3d5c8bcd34edd793d73df9b0f4a4cb7fd
parenta647d27ad7667971b4e526d506e7979705165316
parentdd22636bef71e7412349fa4f9e526d4aef781b09
Merge branch 'MDL-47990_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE