Merge branch 'MDL-43423_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 01:02:29 +0000 (02:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 01:02:29 +0000 (02:02 +0100)
commit69ebcb42224fb2262a172f1ce134e4c70b8e87b2
tree42a12ff2162f215a1bfe124efb35233d0f81cce7
parenta1017ec83782c6a7b4f7ab9ed6ab441a5f300082
parent96ed7ca4dd9aaf8d1440d9ae6c4be216bc8e1de2
Merge branch 'MDL-43423_master' of git://github.com/dmonllao/moodle