Merge branch 'MDL-54734-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jul 2016 07:01:06 +0000 (15:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jul 2016 07:01:06 +0000 (15:01 +0800)
commit9ce24480917f0145f302af41ee752fa4885b1d1e
treedf195baf50dfc2d8fb5b57981d7d60cfad3c6b17
parentde374c3df13a42ece65e69f56871aafe547d7ef9
parentec907228701299fa50634cc88d5206e061b18971
Merge branch 'MDL-54734-master' of git://github.com/lameze/moodle