Merge branch 'MDL-38690_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 19:01:52 +0000 (21:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 19:01:52 +0000 (21:01 +0200)
commit991dcb1b820bfd6135962a7d14ae8e74ca7b9637
tree58be4fc5de7026b631093d153bcc356d1ddc9875
parentd3f422bdc177df001afc490338a89c117093a602
parent6cf9a42f6f2d29ca10bc2d3bd0e00a4202e7f90b
Merge branch 'MDL-38690_master' of git://github.com/dmonllao/moodle