From: Petr Skoda <commits@skodak.org>
Date: Tue, 2 Aug 2011 12:35:21 +0000 (+0200)
Subject: Merge branch 'master_MDL-28535'
X-Git-Tag: v2.2.0-beta~608
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=82b8e88418dfc112f4f89c22ec6559b015ea4a4f

Merge branch 'master_MDL-28535'
---

82b8e88418dfc112f4f89c22ec6559b015ea4a4f