Merge branch 'MDL-36051_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 07:10:06 +0000 (15:10 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 07:10:06 +0000 (15:10 +0800)

Trivial merge