Merge branch 'MDL-38524_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 00:46:11 +0000 (01:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 00:46:11 +0000 (01:46 +0100)
commit668a62ef808d8f5a73b8e34d790e87e1f4d84f92
treeea4f66090952a1560202f03448648d83ac0ab5f0
parent03deed4f750db390f0b1156e942df126c9f737f4
parentf07bf92f533ae629f1dcad8f81c42d47af1aecc6
Merge branch 'MDL-38524_master' of git://github.com/dmonllao/moodle