Merge branch 'MDL-56822-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 17 Nov 2016 06:33:39 +0000 (14:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 17 Nov 2016 06:33:39 +0000 (14:33 +0800)
commit2f0cd733be44cea3d38b42353a78a2b27134c0c8
tree7f42adc7c0dcd37db1dd171cad449c52595565cc
parent4006e187f32f76a4c6fa41e7082995ccb9a3c9b2
parentb5b7af96bba7368a7500b4f4f42059040b54d30e
Merge branch 'MDL-56822-master' of git://github.com/cameron1729/moodle
message/output/popup/lib.php