Merge branch 'MDL-49650-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 10 Apr 2015 07:52:38 +0000 (15:52 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 10 Apr 2015 07:52:38 +0000 (15:52 +0800)
commit4b031fa491793564011ed5bd2ad7af7018c02d0c
tree0a281d50b773913cd765cfe808d0b8db2eb81bea
parent9aabc32294269dda611c461cf99795710594e82f
parent1fcad8433cf7990e810d511dcc8d00b67791f422
Merge branch 'MDL-49650-master' of git://github.com/damyon/moodle