Merge branch 'MDL-50547-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Jan 2017 05:26:47 +0000 (13:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Jan 2017 05:26:47 +0000 (13:26 +0800)
commitd68d5ce33740449a623ff089847d58143a026277
tree4baa93b0a17a405964b6a1e3c1af49f4ce7fdf81
parent6b8e5ce30787843ef94d4900b580efa3108e2bcb
parent429cc9365ec6b272a19ec48e670ed05efb12c8ab
Merge branch 'MDL-50547-master' of git://github.com/jleyva/moodle