Merge branch 'MDL-50890_master' of git://github.com/dmonllao/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 16 Sep 2015 01:10:28 +0000 (09:10 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 16 Sep 2015 01:10:28 +0000 (09:10 +0800)
commit04fadbeda469b3e81bd4f6e461dc9465e75ee200
tree84a44045f73faf80d2160fcf0e6ebbeb7b2e62eb
parent5090d26b3a195223697fbd0ccf30bb07b4b00b42
parent6bc490e270c1f2e0a4b92cd35b9b61b883341bff
Merge branch 'MDL-50890_master' of git://github.com/dmonllao/moodle