Merge branch 'MDL-25186_m20a' of git://github.com/rwijaya/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 11:25:06 +0000 (12:25 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 11:25:06 +0000 (12:25 +0100)

Trivial merge