Merge branch 'MDL-52826_master-fix' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 28 Jan 2016 03:59:27 +0000 (11:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:25 +0000 (10:15 +0800)
commit17cd73b684d6247fec733e84daf5f4d1a5135cde
tree4783f1170e71983a380d1ee0440388bfc894f2b8
parent80f37f273972280c3cdd75d620be1232a72201a6
parent3e51b0ad7ee27bee894798fdba4f1c1de276390a
Merge branch 'MDL-52826_master-fix' of git://github.com/dmonllao/moodle