Merge branch 'MDL-22308_20' of git://git.catalyst.net.nz/moodle-r2
authorPetr Skoda <commits@skodak.org>
Sun, 17 Apr 2011 14:30:41 +0000 (16:30 +0200)
committerPetr Skoda <commits@skodak.org>
Sun, 17 Apr 2011 14:30:41 +0000 (16:30 +0200)

Trivial merge