From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 27 Jan 2014 22:52:07 +0000 (+0100)
Subject: Merge branch 'MDL-43874' of git://github.com/timhunt/moodle
X-Git-Tag: v2.7.0-beta~627
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=835ef9d84c5a85501f750acdcda38a33aff87f3e

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

835ef9d84c5a85501f750acdcda38a33aff87f3e