Merge branch 'MDL-51986-master' of git://github.com/dpalou/moodle
commitf8aaf45d307eb540487ff027ef14a1d3dbe377b3
authorDavid Monllao <davidm@moodle.com>
Mon, 14 Mar 2016 05:59:21 +0000 (14 13:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 Mar 2016 05:59:21 +0000 (14 13:59 +0800)
treebcf6b3c22dc00450c51b93389104fc94d4fcef12
parent459ad3d35df7925a253b63dace79b2f6a8287356
parent9a4c52221e4e71e7d9483be34ec1cf3b7790fb11
Merge branch 'MDL-51986-master' of git://github.com/dpalou/moodle