Merge branch 'wip-MDL-40635-m26' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:43:45 +0000 (00:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:43:45 +0000 (00:43 +0200)
commita6149155c0efee649452adf94b852e8301f9947b
tree5ae0d4ff6eb3f936a764f286b8db2a9f9bb201d8
parentf28051143f45c35afe33430e47df524a2207ae60
parent61b223a632291fd753d2bb44a99646c3bf920ad2
Merge branch 'wip-MDL-40635-m26' of git://github.com/samhemelryk/moodle