Merge branch 'MDL-52438-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 07:31:29 +0000 (15:31 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 07:31:29 +0000 (15:31 +0800)
commit1b42ef0e9910d652971dc8d25d0e78802e121e5e
treeef64714a2f3228c61946169eccbfbba8a275de31
parent948882eb5dca75a74c6336c9d1ca8019e19be893
parent10eb44f7e69e1da2cc705ad5399d9480c6bf342a
Merge branch 'MDL-52438-master' of git://github.com/marinaglancy/moodle