From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 29 Jan 2013 14:35:05 +0000 (+0100)
Subject: Merge branch 'MDL-37533-master' of git://github.com/damyon/moodle
X-Git-Tag: v2.5.0-beta~653
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=96b997d759318c60099788b65f03681ffc765608

Merge branch 'MDL-37533-master' of git://github.com/damyon/moodle
---

96b997d759318c60099788b65f03681ffc765608