Merge branch 'MDL-55049-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 06:16:54 +0000 (14:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 06:16:54 +0000 (14:16 +0800)
commitab698201d7ecca686f42fc6b654f057e912632b1
treef18c9ec738d480676fcdd13b6971c515d190c462
parent91dc1e8795a67d8dd8e960c7c2a224f03f2d8f7d
parent7a8744dba793a0318336e1246e1022b84226b2b1
Merge branch 'MDL-55049-master' of git://github.com/jleyva/moodle