From: Sam Hemelryk <sam@moodle.com>
Date: Tue, 10 Sep 2013 21:28:42 +0000 (+1200)
Subject: Merge branch 'MDL-41238-master' of git://github.com/phalacee/moodle
X-Git-Tag: v2.6.0-beta~379
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=087bc6ba67d1266631f58ab9be36df3d007459fe;hp=-c

Merge branch 'MDL-41238-master' of git://github.com/phalacee/moodle
---

087bc6ba67d1266631f58ab9be36df3d007459fe