Merge branch 'MDL-41421_master' of git://github.com/dmonllao/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 01:53:48 +0000 (11:53 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 01:53:48 +0000 (11:53 +1000)
commit7375d9eb1fce0a6a1238cd2a8e8cc9d9e5bc67d0
treee26a21de3bd2e46529a70e0cc5aa65d17c391f9f
parent4ed604996f3c4086ff9c9501572f164b104ce80c
parent35aa01820881182b56a4c702fc8540989c839007
Merge branch 'MDL-41421_master' of git://github.com/dmonllao/moodle
admin/tool/generator/classes/course_backend.php
admin/tool/generator/version.php
config-dist.php