Merge branch 'MDL-38787_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 11:12:08 +0000 (13:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 11:12:08 +0000 (13:12 +0200)
commitb216376811557c3561e2a3aabde6e3922994a49f
tree5be30ee2b6e187eb0d98c847dc77f3cf82b7f96d
parentd8201d49d8e0f18c3c836d9d4813edf2fb8728ee
parenteff79d53787e0fb66a057a75a88df94b6fa383fb
Merge branch 'MDL-38787_master' of git://github.com/dmonllao/moodle