Merge branch 'MDL-51568-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 13 Oct 2015 02:11:55 +0000 (10:11 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 13 Oct 2015 02:11:55 +0000 (10:11 +0800)
commit09d62af419f7916d2eb60ac90d8bcbbb23363c21
tree96685ff64ac9cbc6bcf8cdc0b706a896f47ee4d8
parentac1f81a187f962566edab06698cfaead08ad1896
parente8ad99ab91f6f127b176dd28f61f3bfe264951cd
Merge branch 'MDL-51568-master' of git://github.com/jleyva/moodle