Merge branch 'MDL-52361-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 06:49:15 +0000 (14:49 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 06:49:15 +0000 (14:49 +0800)
commit3e702b5855cd71f741ff057e01ea2ed15846dd32
tree9451a8834d9212cfb1c27a6b14290e20972e2f68
parent9e313e798f6d793dda22a71f75a71b0f961a0d79
parent19ad1ce44c7c463b223777c213a2abbc1c5c2f64
Merge branch 'MDL-52361-master' of git://github.com/marinaglancy/moodle