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

Trivial merge