Merge branch '43822-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 00:55:23 +0000 (01:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 00:55:23 +0000 (01:55 +0100)
commit974cc3b0c2fa8551e57acd9d2faf107d26832f83
tree22f1e29a61974f910b613528ad307bebae26771f
parentf3da891068b35a9f43ce5e30734b3554ac7404ca
parent496e46b1ee2440bf4591d2a62a766d41d0e070d7
Merge branch '43822-27' of git://github.com/samhemelryk/moodle