Merge branch 'wip-mdl-54600' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 May 2016 02:54:45 +0000 (10:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:11 +0000 (17:16 +0800)
commit7ae90fe03ce9850ceeda180bcba4119cb1634a2f
treef43ea0b01edb584a90f3dd9a527c0dcc8898c42b
parent2fb0f13a87e6d63695044117e3f1f6560ca81df1
parent39257eb39c4997fbf3c0b09b404a740000b67d14
Merge branch 'wip-mdl-54600' of https://github.com/rajeshtaneja/moodle