Merge branch 'wip-MDL-41937-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 12:05:10 +0000 (14:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 12:05:10 +0000 (14:05 +0200)
commitdd0fa1adb1cf26205867c4158f3f034de90644d8
treeecf2f704396b7a0178671fc14c3a258a03632471
parent0aab5cbc5921d27cc332af18c175c04339a0e95d
parentc3a994aeef9d06372efbf0dba9463abd76774f6e
Merge branch 'wip-MDL-41937-master' of git://github.com/marinaglancy/moodle