Merge branch 'MDL-35364' of git://github.com/timhunt/moodle
commit274511f0cbfe5c6748f14be26c126b3c5c7b754f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Apr 2013 21:35:46 +0000 (24 23:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Apr 2013 21:35:46 +0000 (24 23:35 +0200)
tree730b8764af4abf3a8cf189a983d65d657b2eafe5
parentba26ed9cac55721ea1fe338ec417f8955fc029fa
parent4a7cc248088d60fc8bc34174ccab0e83c266aefe
Merge branch 'MDL-35364' of git://github.com/timhunt/moodle