Merge branch 'MDL-51052_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Sep 2015 09:53:29 +0000 (10:53 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Sep 2015 09:53:29 +0000 (10:53 +0100)
commitee3ca2d71b9d0031c5ef9a84d0c691998992fbf7
tree7decb952fd9f890e097658259936de4304927323
parentc331e8f9c0e05d1feeeda0a2621bb1b07efcf3c3
parent2bdeb8ef3026a12daef0f3e4534c101d27c24c57
Merge branch 'MDL-51052_master' of https://github.com/dmonllao/moodle