From: Sam Hemelryk <sam@moodle.com>
Date: Mon, 9 Dec 2013 20:25:51 +0000 (+1300)
Subject: Merge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle
X-Git-Tag: v2.7.0-beta~959
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=176521e560a3e91eb2b2117a401c4465a6eb6e5e

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

176521e560a3e91eb2b2117a401c4465a6eb6e5e