Merge branch 'MDL-25291_20_admintreeflag' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 31 Jan 2011 07:56:25 +0000 (08:56 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 31 Jan 2011 07:56:25 +0000 (08:56 +0100)

Trivial merge