From: Sam Hemelryk <sam@moodle.com>
Date: Sun, 25 Nov 2012 21:24:42 +0000 (+1300)
Subject: Merge branch 'master_MDL-36772' of git://github.com/danmarsden/moodle
X-Git-Tag: v2.4.0-rc1~83
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=f1a90cc4fedc23bbbf25bc9422b80c457ba00275

Merge branch 'master_MDL-36772' of git://github.com/danmarsden/moodle
---

f1a90cc4fedc23bbbf25bc9422b80c457ba00275