Merge branch 'wip-MDL-34012-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:57:15 +0000 (02:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:57:15 +0000 (02:57 +0200)
commit6faa51785601fa6f16b8955cb1d276948f5f3eb6
tree7185710ba2ccd32f466c5daa8e265d5355902eef
parentb224448ac6ff1c4c17024ed0f09562567b0448ea
parent9dbcfd93e4cc1362a29e7186c68fea61e1b90f59
Merge branch 'wip-MDL-34012-master' of git://github.com/marinaglancy/moodle