Merge branch 'master_MDL-29207' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 07:54:43 +0000 (15:54 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 07:54:43 +0000 (15:54 +0800)

Trivial merge