Merge branch 'MDL-53309_master-second-attempt' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 09:27:57 +0000 (10:27 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 09:27:57 +0000 (10:27 +0100)
commitad2382730e19424236053f4f2aab2b8de30ac3ac
tree07142cb16ddedfd91de71a7083391af289b71d94
parent15a813cda2cad66f2ae2434c5998d383d486c112
parent1076e02f29e3003a2a0d298057847855fda8cfd9
Merge branch 'MDL-53309_master-second-attempt' of git://github.com/dmonllao/moodle