Merge branch 'MDL-38618_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 23:44:58 +0000 (01:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 23:44:58 +0000 (01:44 +0200)
commit60f9cae763958b543a3cb9c3f3836a0692828606
treeb52c51ce77116d67f562d2ede004e572d1aaac47
parent70273fb6ae84ca8d5f294e601f718f8ba52fefeb
parent355a2c2c2557eb4fabb2cf39e76609888267a8a1
Merge branch 'MDL-38618_master' of git://github.com/dmonllao/moodle