Merge branch 'MDL-54601-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Jun 2016 06:14:23 +0000 (14:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jun 2016 07:05:22 +0000 (15:05 +0800)
commit628c52e4655175d82a65e8f85a672e60fdbc8bda
treea0f308682370ebac1f01f5d9bdad585c6c4e430c
parent3654734601537eefea158b59c7e856b2b8457707
parent89823b1ae34de608a12f8a02f3ae728463aebcfb
Merge branch 'MDL-54601-master' of git://github.com/jleyva/moodle