Merge branch '42609-28' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jul 2014 18:31:25 +0000 (20:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jul 2014 18:31:25 +0000 (20:31 +0200)
commit4c8914b7779528b24f3777404f638d519e7af15b
tree10ce01b50e6a09a60c8b613fecba08c226d20a00
parent7a26204e18b5b9f843ae60376f2fc2c169abd343
parentddd2361e80619cc46b7465926e3e60696461d50c
Merge branch '42609-28' of git://github.com/samhemelryk/moodle