Merge branch 'MDL-43337-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 22:24:45 +0000 (23:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 22:24:45 +0000 (23:24 +0100)
commit33ce661816c37f6f03a52737ed7331cf4869e477
treef1f5363bef885456072276019c1c48275b15fef5
parentf68e555684ef91c0d52ce4759a101bb69bce21a5
parent457b82f23865dfffdea353b062de9a329f4579cf
Merge branch 'MDL-43337-master' of git://github.com/FMCorz/moodle