Merge branch 'MDL-35750' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 11:57:10 +0000 (12:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 11:57:10 +0000 (12:57 +0100)
commit345768b9b80905e8e3aa116cf08497a67c1a1118
tree468d52d1f1c1f8fffcf7a6db2d374e59251e63ca
parenta5b1f1e2f272b901938606c2ebb826106573b3f6
parent47570cc67db7f592fe1beebf313a7895c72559a3
Merge branch 'MDL-35750' of git://github.com/danpoltawski/moodle

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