Merge branch 'MDL-39586_master' of git://github.com/dmonllao/moodle
commit1065589db1a4c0dad35e51d3f0bb8ec819cda5ab
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2013 00:31:50 +0000 (10 02:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2013 00:31:50 +0000 (10 02:31 +0200)
treea1293aa3e4168b0f1a20b8d664d2f6cd5fea8b2d
parentdd334c7a8b0950cf0d118ccfae08dee2e0a35308
parent5d7b6307b1cd98e805fa30d04cb14c45a3c52f80
Merge branch 'MDL-39586_master' of git://github.com/dmonllao/moodle