Merge branch 'MDL-47713-master-fix1' of http://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 07:18:31 +0000 (08:18 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 07:18:31 +0000 (08:18 +0100)
commitbcd015bea61388ceae872ab051de3b61be70c85e
tree576c2c4443dd045593c5644001b47f49871f3429
parent99e455c7ea315b70cba33b0a9b6225031724bc76
parented60e0eac59d049d1889810c5bb28286cb4bbca7
Merge branch 'MDL-47713-master-fix1' of github.com/damyon/moodle