Merge branch 'MDL-41827_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 00:38:34 +0000 (02:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 00:38:34 +0000 (02:38 +0200)
commit75c7c412831707ca2b15e93f1d5ae69e429f2e82
treedc9a7257ab02aee8398415bafcc84ac2461d2866
parent14976b35687e12241b03eaa73cc34eb01aaafdc6
parentc43ef6c624953e4c94f5c0a7c364af7e3c6f1036
Merge branch 'MDL-41827_master' of git://github.com/dmonllao/moodle

Conflicts:
admin/tool/generator/classes/site_backend.php
admin/tool/generator/classes/site_backend.php
admin/tool/generator/cli/maketestcourse.php
admin/tool/generator/cli/maketestsite.php