Merge branch 'MDL-54787_master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jun 2016 03:50:18 +0000 (11:50 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:07 +0000 (09:04 +0100)
commit337ee7ffa278097f35c33fc0d14a3b8d5d50e644
treef71a89d9d7a04223e8d53c3ba0851b3906c9c47d
parent1e7aaed887d0f1eb19469f7b57b531a010b2336c
parentcd6dfd68d83dbb4fd67a969934885cc3be2d051a
Merge branch 'MDL-54787_master' of https://github.com/snake/moodle