Merge branch 'MDL-50153-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 8 May 2015 05:21:29 +0000 (13:21 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 8 May 2015 05:21:29 +0000 (13:21 +0800)
commitf9c14c6135bd900206358393cc9b77cc83e079b0
tree9c691075122af42ba826c386746566b3455198c0
parentf84a0d49c11cf3177c470a3e9ac04c081137b472
parent2d07240f2399d0128ab55bcba86cc1c9431ab306
Merge branch 'MDL-50153-master' of git://github.com/andrewnicols/moodle