From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 20 Dec 2011 00:59:46 +0000 (+0100)
Subject: Merge branch 'MDL-30738' of git://github.com/kiklop74/moodle
X-Git-Tag: v2.3.0-beta~1525
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=3ed2e334d8f4de504c79f456039d22b4c9061e9b

Merge branch 'MDL-30738' of git://github.com/kiklop74/moodle
---

3ed2e334d8f4de504c79f456039d22b4c9061e9b