Merge branch 'wip-MDL-40677-m26' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 10:52:50 +0000 (12:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 10:52:50 +0000 (12:52 +0200)
commitd4731fd002bb8b2e1e93d1eb71ceefc659719e08
treedee901c5c7ea3eeb426c28042ea8f686d5680946
parent3b117e79ce4092fc578897072586885468dd7c5d
parent67da59999ad9629ec8bc407850f8fe9e32ef24ee
Merge branch 'wip-MDL-40677-m26' of git://github.com/samhemelryk/moodle