Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Mar 2012 08:10:17 +0000 (10:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Mar 2012 08:10:17 +0000 (10:10 +0200)
commit296c0247c6cc9e525721fc92b5a78c7146e6887d
tree1447ee607b65b9eb2d130890626e6ba575e97214
parent2511b0742a3695298d8216fe9723581c089909d7
parentcac06a034dd3e559ab8ae20cb162cf90582a8776
Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle

Conflicts:
lib/db/upgrade.php
version.php
course/lib.php
lib/db/upgrade.php
version.php