Merge branch 'MDL-37897' of git://github.com/jmvedrine/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 23:56:24 +0000 (00:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 23:56:24 +0000 (00:56 +0100)
commitadc4aca4755005b670503651e3445d6c77992a75
tree03b1facd2fe73ccaadcddba518f682891bd8396d
parentcdbbd48a66640428317a0b035f3bc873b7bf4788
parent4f315786e8a010865d41af7726aa9743aed64bb8
Merge branch 'MDL-37897' of git://github.com/jmvedrine/moodle

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