From: Dan Poltawski <dan@moodle.com>
Date: Tue, 2 Dec 2014 08:47:07 +0000 (+0000)
Subject: Merge branch 'MDL-48285_master' of git://github.com/dmonllao/moodle
X-Git-Tag: v2.9.0-beta~874
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=690a6341569d9b35ed7af32f33cf1498b0c4ab29;hp=-c

Merge branch 'MDL-48285_master' of git://github.com/dmonllao/moodle
---

690a6341569d9b35ed7af32f33cf1498b0c4ab29