From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 23 Apr 2012 23:47:14 +0000 (+0200)
Subject: Merge branch 'MDL-32454-master-1' of git://git.luns.net.uk/moodle
X-Git-Tag: v2.3.0-beta~695
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=434fc13dbec8348d42a1988bdf9eff1e7d5d2bf7

Merge branch 'MDL-32454-master-1' of git://git.luns.net.uk/moodle
---

434fc13dbec8348d42a1988bdf9eff1e7d5d2bf7