Merge branch 'wip-MDL-41288-fix' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Sep 2013 12:16:14 +0000 (14:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Sep 2013 12:16:14 +0000 (14:16 +0200)
commitf073ea045eb4416048faface27e273a0d2502b0a
treef2b3864235ecb801618a5687071b257b20d37103
parent34ac96bf6d42463e3a869aefd7aa9bbb34887745
parent341e2460cd730e6177c7f2e158ff9703217d9ff5
Merge branch 'wip-MDL-41288-fix' of git://github.com/marinaglancy/moodle