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

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

437fd401f92a6032892c23006f39ad81f8bf13d9