Merge branch 'master_MDL-34231' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 31 Jan 2013 02:14:46 +0000 (10:14 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 31 Jan 2013 02:14:46 +0000 (10:14 +0800)

Trivial merge