Merge branch 'MDL-48920-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE
commitcb4f747758cb420d056a1e61be00c1ae4a9fd144
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Feb 2015 08:12:22 +0000 (3 16:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Feb 2015 08:12:22 +0000 (3 16:12 +0800)
treeba03eb568cf99cb603f397f293c52f40cf59761f
parent4d70a24d324dac47151e2bf84048ff8629a0e5e1
parentf321e5a222abba1174e94c196a0ae4bdd2637f01
Merge branch 'MDL-48920-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE