Merge branch 'MDL-38557' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:38:07 +0000 (23:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:38:07 +0000 (23:38 +0100)
commitcf140de9459a3f98496129aab331f6f06e0aa456
tree053d39da0a5063ad9089671a8e6bd85529bb3826
parentb741fac30841606cfbf057b6710898d1f03b1a11
parent7dbde4ed3b9329cc3cecef26f98f3b0944459524
Merge branch 'MDL-38557' of git://github.com/timhunt/moodle

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