From: Damyon Wiese <damyon@moodle.com>
Date: Tue, 14 Jan 2014 07:18:37 +0000 (+0800)
Subject: Merge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle
X-Git-Tag: v2.7.0-beta~723
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=a1ac22b8152ee28391c97ff65399625007b13ce1

Merge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle
---

a1ac22b8152ee28391c97ff65399625007b13ce1