From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 26 Sep 2011 22:45:45 +0000 (+0200)
Subject: Merge branch 'MDL-28686' of git://github.com/bostelm/moodle
X-Git-Tag: v2.2.0-beta~308
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=bde5c82a20a84c4cd2c71152afe2536e2e87d234

Merge branch 'MDL-28686' of git://github.com/bostelm/moodle
---

bde5c82a20a84c4cd2c71152afe2536e2e87d234