Merge branch 'MDL-38940_master' of git://github.com/dmonllao/moodle
commit33fcbe89d4eef4f409f3f2359be2c591d457aa16
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 11 Apr 2013 14:11:40 +0000 (11 16:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 11 Apr 2013 14:11:40 +0000 (11 16:11 +0200)
treeac0beb3e3a69b4fc6f2425984ea709fa3f1a02cf
parentc51e1fa37e9a388740f0fc8757e7d13a30b62b56
parent58c2fae5257f2acafec40e567034a1d0c1c899c8
Merge branch 'MDL-38940_master' of git://github.com/dmonllao/moodle