Merge branch 'MDL-35870' of git://github.com/nobelium/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 23:06:53 +0000 (01:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 23:06:53 +0000 (01:06 +0200)
commit857449d769f0620cab26a139c93b67b39e06e5b9
treecfd7681a2d225129954884633bfbb0b398766b97
parent2c3d6f240fe3d00fe199ef434991a9218ce6284d
parentad88d3ed2af1511df5f7f40e0aafeaa5a15b722e
Merge branch 'MDL-35870' of git://github.com/nobelium/moodle