Merge branch 'MDL-50958-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Aug 2015 07:40:10 +0000 (15:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Aug 2015 07:40:10 +0000 (15:40 +0800)
commit1e5b562ac98ca1af07472583ca26c83351176ab7
treeb91b6dfe678fcc2ab7da4e6ca07cd2c791171a54
parent259bd67ce920fb4187026566a0f81a469ec6e699
parent88a26baec043d08e18a00f386aabe0af57d1617d
Merge branch 'MDL-50958-master' of git://github.com/lameze/moodle