Merge branch 'MDL-35966-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 28 Nov 2012 06:15:28 +0000 (14:15 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Nov 2012 06:15:28 +0000 (14:15 +0800)

Trivial merge