Merge branch 'MDL-25573_m20' of git://github.com/rwijaya/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 31 Jan 2011 08:04:29 +0000 (09:04 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 31 Jan 2011 08:04:29 +0000 (09:04 +0100)

Trivial merge