Merge branch 'wip-MDL-42310-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 00:32:28 +0000 (01:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 00:32:28 +0000 (01:32 +0100)
commit0601a82aff380e5369fce4ce0ed91a4ae70c1e03
tree908d0f93d2d6e4efd3fd14891f200084c3f60ab5
parent267d4927b4d52d6f3559b499f8570dc20297bb43
parenta059b434f75cba797bc20a7f8265d401eae17e0f
Merge branch 'wip-MDL-42310-master' of git://github.com/abgreeve/moodle