From: Petr Skoda <commits@skodak.org>
Date: Sun, 17 Apr 2011 14:30:41 +0000 (+0200)
Subject: Merge branch 'MDL-22308_20' of git://git.catalyst.net.nz/moodle-r2
X-Git-Tag: v2.1.0~206^2~33
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=c001225250bcd2349e262e68b7a38b034edb4a44

Merge branch 'MDL-22308_20' of git://git.catalyst.net.nz/moodle-r2
---

c001225250bcd2349e262e68b7a38b034edb4a44