From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 27 Aug 2012 14:32:30 +0000 (+0200)
Subject: Merge branch 'MDL-35023' of git://github.com/timhunt/moodle
X-Git-Tag: v2.4.0-beta~664
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=05a024d393cd05e97a1ec286bcec0ac2daccc819;hp=05a024d393cd05e97a1ec286bcec0ac2daccc819

Merge branch 'MDL-35023' of git://github.com/timhunt/moodle
---