Merge branch 'MDL-50307-master-3' of git://github.com/xow/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 21:44:50 +0000 (23:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 21:44:50 +0000 (23:44 +0200)
commitb7759a1889b32b19b987b1fe504b06463f20e033
treefa1a62b53317726977672b3985887aba145c2f20
parent789d40a803145ca56476b64d56eabfd2fb54fe24
parent78a713685d48c164c117df0b824495efd30bb0bb
Merge branch 'MDL-50307-master-3' of git://github.com/xow/moodle