Merge branch 'MDL-47266' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:12:16 +0000 (01:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:12:16 +0000 (01:12 +0200)
commit44af6d53a7dc2e623a44ab79f132c99759449c4c
tree0bff9d6f9655ec8d110d28ab6eded113b9c7b5f6
parent358f31672bd3b48488853ad26ad8dc8b4d27ff4c
parenta7b0bd1331fa17abdd2ebbd7498b26008fb89c01
Merge branch 'MDL-47266' of git://github.com/timhunt/moodle