Merge branch 'MDL-43401-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:46:16 +0000 (01:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:46:16 +0000 (01:46 +0100)
commit2079744b84574992d58d8be70b00b336a4b7a26f
tree67d066cdd22e35546587303cf25f92727c2103d5
parentb7623bcb5d6663a17669ff9de66125ea0333e267
parent63fe00c9966da32afd952229637758c134782d65
Merge branch 'MDL-43401-master' of git://github.com/FMCorz/moodle