Merge branch 'wip-MDL-26781' of git://github.com/sammarshallou/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 21 Mar 2011 18:10:15 +0000 (19:10 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 21 Mar 2011 18:10:15 +0000 (19:10 +0100)
1  2 
lib/adminlib.php

Simple merge