Merge branch 'MDL-49743-29' of git://github.com/danpoltawski/moodle into MOODLE_29_STABLE
commit81c8f80dae643f4116c798e58b939404b53d3c46
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Dec 2015 16:14:05 +0000 (22 17:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Dec 2015 16:14:33 +0000 (22 17:14 +0100)
tree042a050dcff31b2e80d364427e100da6d7dece35
parent94d60b142c83a6da915508163e93424cbc3a5094
parent1240c086ebf79fc72dee28892c82a8ec2625d09a
Merge branch 'MDL-49743-29' of git://github.com/danpoltawski/moodle into MOODLE_29_STABLE