Merge branch 'wip-MDL-34234-m24' of git://github.com/samhemelryk/moodle
commita88258ac9f8f2a6a016cd2a22fbfef6eafd3a35a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 11:09:44 +0000 (1 13:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 11:09:44 +0000 (1 13:09 +0200)
tree159a46b05e63ea85f50626624f93d524c47adf91
parentc3f06aacef38236d532ffb4c0e58b8a99d38f55e
parent10654e32e22466a392f19806dfe38c09d21096a6
Merge branch 'wip-MDL-34234-m24' of git://github.com/samhemelryk/moodle