Merge branch 'MDL-41693-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:13:04 +0000 (01:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:13:04 +0000 (01:13 +0100)
commitad1ad9f5b41f571ea8f0deef8dfc5fa6c6fca471
treeefef883f7f130f9193cea78bfcf4785a34c211e8
parentb0512f418b8a2efdff3680d49a24e7636997c9fe
parentf196f42c84ff604f39733752c00e5f85b774a987
Merge branch 'MDL-41693-master' of git://github.com/FMCorz/moodle