Merge branch 'MDL-38532_master' of git://github.com/dmonllao/moodle
commitfc99ef7ebb75896720c3d170f69d8e9fb5dd5082
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 May 2013 08:30:25 +0000 (8 10:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 May 2013 08:30:25 +0000 (8 10:30 +0200)
tree0e3d77628c2e19475d3fc98cb0ef908557e3fa9f
parent1d8288f242e1e0cb2e7c356f686880c787c97e48
parent8c700da3d8d6d8c05e08a26678f4119c7f8aa102
Merge branch 'MDL-38532_master' of git://github.com/dmonllao/moodle