Merge branch 'MDL-43423_master-increase-timeout' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 08:55:08 +0000 (09:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 08:55:08 +0000 (09:55 +0100)
commitd68829aac0f031066e1a4e3d0a06deaeb4142235
tree631cf42b26f181b20f407badd54afd32891c54f6
parent7de1b42f557376c91e6b9a96add442c44aa90ff9
parent845ceaff9f5d41ed1a7c7a12bb56a26fd250bcc0
Merge branch 'MDL-43423_master-increase-timeout' of git://github.com/dmonllao/moodle