Merge branch 'MDL-52335-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 07:47:14 +0000 (15:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 07:47:14 +0000 (15:47 +0800)
commita4fb9924353a4d34cb46cf96e7ccccd8d009ab55
tree0d1d9e3324f25f33e3216d5bd65d9ae4dfc3ed91
parent1b42ef0e9910d652971dc8d25d0e78802e121e5e
parent83bef8dabbd26844b25e5612ba89fb2dd24f7b07
Merge branch 'MDL-52335-master' of git://github.com/marinaglancy/moodle