Merge branch 'MDL-36368_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 08:49:35 +0000 (16:49 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 08:49:35 +0000 (16:49 +0800)

Trivial merge