From: Sam Hemelryk <sam@moodle.com>
Date: Tue, 2 Oct 2012 20:53:11 +0000 (+1300)
Subject: Merge branch 'MDL-35654_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
X-Git-Tag: v2.3.3~140
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=9289c14e0c81f1a044909b040cd6c68fc46f083a

Merge branch 'MDL-35654_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
---

9289c14e0c81f1a044909b040cd6c68fc46f083a