Merge branch 'MDL-46671-27' of https://github.com/pjking07/moodle into MOODLE_27_STABLE
commit56eb183b01022b3c1d0187e5e0123d2532f69f28
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Jan 2015 05:58:03 +0000 (12 13:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Jan 2015 05:58:03 +0000 (12 13:58 +0800)
tree4eea80f6b7d3e1820ee637aa4733381dca9af629
parent1ffb2f5e2e321faa34b31725271121a36a786167
parent719c2dac88c8f9c8237bd14a929045f1a2f764ff
Merge branch 'MDL-46671-27' of https://github.com/pjking07/moodle into MOODLE_27_STABLE