Merge branch 'MDL-47787-master' of https://github.com/tbannister/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Jun 2015 07:52:52 +0000 (09:52 +0200)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Jun 2015 07:52:52 +0000 (09:52 +0200)
commit1b808498561a2d7c7c1022bb08fffeb52b5ebaaa
treed00da9d75fcca0b9bcfb546e69eb755439d78b18
parent35af60da7e2e4f2fafa821a9edb2088057bc1e27
parent7f7144fd505e87553931c65a752ff4a417cbc3b9
Merge branch 'MDL-47787-master' of https://github.com/tbannister/moodle