Merge branch 'MDL-49796-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 12:01:18 +0000 (13:01 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 12:01:18 +0000 (13:01 +0100)
commit82b9551f2d9e74ab1b9a63d92419980f023806bf
treed5372b3a90e0742f3916ddb62943df34a1b64a7e
parent2002b96aeabd4aa35c1d7894970ef6ad0acb99c7
parent1c2b7882564e21a7addfadd82d79e226ca77380e
Merge branch 'MDL-49796-master' of git://github.com/jleyva/moodle