Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 06:22:11 +0000 (14:22 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 06:22:11 +0000 (14:22 +0800)
commit0c241b980ad080cb2d154a3bec9e25627f549dc0
treecf4a11971d6a90f1ff64324860367fc69352df1b
parent8af0dffb5017fea25bf1401b290140711b306e51
parent4e53188a4baa461d289dfe051519f7210e95f72b
Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle

Conflicts:
lib/upgrade.txt
course/edit_form.php
lib/deprecatedlib.php
lib/testing/generator/data_generator.php
lib/upgrade.txt