Merge branch 'MDL-35130-master' of https://github.com/mackensen/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 02:50:46 +0000 (10:50 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 02:50:46 +0000 (10:50 +0800)

Trivial merge