Merge branch 'master_MDL-37714' of git://github.com/greg-or/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Feb 2014 16:58:30 +0000 (17:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Feb 2014 16:58:30 +0000 (17:58 +0100)
commit4f31798dfcde638578fced53e8553676af261568
tree541148ff20b5419efbb6a8aefedcaf4b2a015b1c
parent8621a0ece56830ad8aa31d941f53969c268da19c
parent20c9f4a1338def52356ad3c24a480769bf83f481
Merge branch 'master_MDL-37714' of git://github.com/greg-or/moodle