Merge branch 'MDL-56612_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 05:40:00 +0000 (13:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 05:40:00 +0000 (13:40 +0800)
commit51e89686353bc521f6ce65425e3a5ccb38ea8102
tree282e1e8c8a35c481d7b159458ebd5ad0239267d9
parente67c14053e3d32d49fdd39280f7b3aa87224bf3b
parent57c01bca0e1bee39dc1fc72198846923054e8f14
Merge branch 'MDL-56612_master' of git://github.com/dmonllao/moodle