Merge branch 'MDL-46063_master' of git://github.com/schach/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 16:29:14 +0000 (17:29 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 16:29:14 +0000 (17:29 +0100)
commitbbe04d27f2daeecb935e8c8a6305519abdae1309
tree7b37bcf87cfc04c5f7e9bb22c173942d0ae38417
parentc07969400acbfee1c3ea0beb130ad39c849f6a0e
parent4c7a19eccc05fc2cd8ff6d17caeb010dc7d7e579
Merge branch 'MDL-46063_master' of git://github.com/schach/moodle