Merge branch 'MDL-39717_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 May 2013 22:44:05 +0000 (00:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 May 2013 22:44:05 +0000 (00:44 +0200)
commit5e1a48df9748bb160f6033ed325a6d9cbdd2ce6f
treec922c11fb25f1b7eef31918a9d2222ce1295b45b
parent98204580b3d93af744e3a93301ebd5ede484f4b1
parent686279d0478af04b40a1a819be9867d793da9daa
Merge branch 'MDL-39717_master' of git://github.com/dmonllao/moodle