Fixed conflicts & merge branch 'MDL-17201_index' of git://github.com/andyjdavis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 14:34:40 +0000 (15:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 14:34:40 +0000 (15:34 +0100)
commite89a57dc100ea1b6b1801d9d163a915a5ad2f51b
treec1dbc0e9762488e0f7d7617d3a8933e528062851
parent9700d6835df8c7fe00a18c1eed4e62de25623c37
parent0d92d04f2ec12943ddd5fc5f57e742efa242aa8d
Fixed conflicts & merge branch 'MDL-17201_index' of git://github.com/andyjdavis/moodle
lib/db/install.xml
lib/db/upgrade.php
version.php