Merge branch 'MDL-54948-master-fix2' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Jun 2016 02:50:14 +0000 (10:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Jun 2016 02:50:14 +0000 (10:50 +0800)
commit0f56ea9d2f3f4a4fc9b2a05e0c3ed83028ae5a03
tree0c58f96b4c38279f0cedc671584a87cbf8050535
parent797b7efc0bd4b3eb34f4cdd3a275218312fd1f8c
parent37eafbb6dcc3aa0beebc73dd6fa2c3ebbbd025db
Merge branch 'MDL-54948-master-fix2' of https://github.com/lameze/moodle