Merge branch 'MDL-29474' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2011 08:33:37 +0000 (10:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2011 08:33:37 +0000 (10:33 +0200)
1  2 
lang/en/admin.php
lib/setuplib.php

Simple merge
Simple merge