Merge branch 'master_MDL-43045' of git://github.com/totara/moodle
commit51e9d69af2312c812c96931e5aac947e71d10644
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Nov 2013 20:27:35 +0000 (26 21:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Nov 2013 20:27:35 +0000 (26 21:27 +0100)
tree99e5b4daa601a8ef553adc47185220373544e9e8
parente359857e410705dc88d6e3176296a27295ab2565
parentb92709db4033c91d8a3784fbcfe66c6a9bb08695
Merge branch 'master_MDL-43045' of git://github.com/totara/moodle