Merge branch 'w40_MDL-41999_m26_userpw' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 13:59:06 +0000 (15:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 13:59:06 +0000 (15:59 +0200)
1  2 
calendar/export.php
lib/upgrade.txt

Simple merge
diff --cc lib/upgrade.txt
Simple merge