Merge branch 'MDL-52503_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jan 2016 14:47:45 +0000 (14:47 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jan 2016 14:47:45 +0000 (14:47 +0000)
commit37727364bb75c6568577fc77692eb8fced2f13fd
treeb0bbcda5fa91bcbd26c646d09fc5c6ddba869a79
parent3348fa77ffac6c3005ccf63e6564807699a73673
parent1a51661b94d534aa5b4208357953aeb636bbed71
Merge branch 'MDL-52503_master' of git://github.com/dmonllao/moodle