Merge branch 'MDL-38307_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:50:50 +0000 (00:50 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:50:50 +0000 (00:50 +0100)
commit8aa0a1423b5de92c24a9425bc97fc1487f8d5b42
tree278d0988087ca896d4461c95defbacf34ed341c7
parent705d41c895292b89aec658f441a1f90e3c1d4002
parentbceb65ee2d346209364f3e4c36e9a28754975f68
Merge branch 'MDL-38307_master' of git://github.com/dmonllao/moodle