Merge branch '36296-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 16:59:06 +0000 (17:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 17:09:15 +0000 (18:09 +0100)
commitbd308dd09f4c2bd2adf04f1768675852601568b5
tree984aec166f79cda7c9dc0fcd9b5bb9e51c4d0539
parent4dae1afb586e6244c35c2d58656f228cc5ca02fb
parent892e21aadd5af7fad06e3c6b37085da6b07e5624
Merge branch '36296-29' of git://github.com/samhemelryk/moodle