Merge branch 'MDL-49758-master' of git://github.com/StudiUM/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 09:05:48 +0000 (17:05 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 09:05:48 +0000 (17:05 +0800)
commit20b3638322fa123dd8beaaf565488e33a134fe15
tree97b6668f7d9b3ab0961dd3bb9f6aa916994b0c2c
parent5cbc9819fdd75b44e4e5f50e710c67bed452e272
parentbeb992afb45f18f4ca40471672fc8e4ccf31ee3a
Merge branch 'MDL-49758-master' of git://github.com/StudiUM/moodle