Merge branch 'MDL-42214_popup_blocked' of https://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Jul 2014 03:27:16 +0000 (15:27 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Jul 2014 03:27:16 +0000 (15:27 +1200)
commitceeb287740a1ab6cd77a2092574eb6c6b27b4cd7
tree45187db67015cd2c8d0a34d6b878d189c4340c66
parent628e818be26460d8f2ee6d55f857c637f6953c8b
parent727c69ca9e6fcaaf1508e9f8e5a60ff2b2949907
Merge branch 'MDL-42214_popup_blocked' of https://github.com/andyjdavis/moodle
lib/moodlelib.php