Merge branch 'wip-mdl-52839' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Jan 2016 23:40:12 +0000 (00:40 +0100)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:20 +0000 (10:15 +0800)
commit94fe0fa02ed3cf0712550c2534411cab733021b4
tree1d4c8f467f5ba993e72b65c1b5a1dc5164692f46
parent81be5d34565c2c1bfbece8940bf35e3821c0de38
parent380ab95f20103b22b67db85c904c62bd3353a195
Merge branch 'wip-mdl-52839' of https://github.com/rajeshtaneja/moodle