Merge branch 'w07_MDL-23939_20_completeuser' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 16:10:29 +0000 (17:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 16:10:29 +0000 (17:10 +0100)
1  2 
lib/db/upgrade.php
lib/navigationlib.php

Simple merge
Simple merge