Merge branch 'MDL-28565_M' of git://github.com/nebgor/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Aug 2011 08:13:18 +0000 (10:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Aug 2011 08:13:18 +0000 (10:13 +0200)
1  2 
admin/index.php

diff --cc admin/index.php
Simple merge