Merge branch 'MDL-52936_30_STABLE' of https://github.com/marxjohnson/moodle into...
commit7ce4f46db62ebb599a12eb14b9c0bf35f13ea383
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 02:07:07 +0000 (1 10:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 02:07:07 +0000 (1 10:07 +0800)
tree8c80e75be8c537062cbfe71f363c693138e0f8f4
parent471da1eca2e8e11a523031bf963b05288227b4d1
parent06b13fb79ffb324a23d0cd093906f834c69033d4
Merge branch 'MDL-52936_30_STABLE' of https://github.com/marxjohnson/moodle into MOODLE_30_STABLE