Merge branch 'MDL-54617-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jun 2016 15:41:46 +0000 (16:41 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:10 +0000 (09:04 +0100)
commit435fb1381416e5ce12182747ea16653567b5b13d
tree9677c94b27c613eea140041176b05714f95706a3
parent4f400df5230c355735fd3ab2362c2a46679f6777
parent4b2dbdecd1cdfdd536e316a50d7467ec117176b6
Merge branch 'MDL-54617-master' of git://github.com/cameron1729/moodle