Merge branch 'wip_MDL-40074' of https://github.com/jamiepratt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Jul 2013 18:22:47 +0000 (20:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Jul 2013 18:22:47 +0000 (20:22 +0200)
commitdbdfd37709a5df194bd9cfda3ce352e5ad5b7448
tree3aa869821c9973265d3e2722de87eefd1b4c4416
parent84c5f6416e60f78c38cbe63b4fca97b6246e4213
parent2baf8e8a0b822a7980d7af58294daae2eccff744
Merge branch 'wip_MDL-40074' of https://github.com/jamiepratt/moodle