Merge branch 'MDL-47990' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 23:22:32 +0000 (00:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 23:22:32 +0000 (00:22 +0100)
commit4723da1bffd44be74f6721453add5321436bc4f4
treef506f9d4687b9d51d0c701a11afa4b1e2e79dda4
parent862b76f39bc402f20f0d1ad6fa2023d047cc3433
parent749606288ea2156aab51159bc33b83c08a3ffa1f
Merge branch 'MDL-47990' of git://github.com/timhunt/moodle