Merge branch 'MDL-26784-plugin-manager' of git://github.com/mudrd8mz/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 4 Apr 2011 09:55:39 +0000 (11:55 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 4 Apr 2011 09:55:39 +0000 (11:55 +0200)
1  2 
lang/en/admin.php

Simple merge