Merge branch 'MDL-39851-master-squashed' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Aug 2013 02:56:26 +0000 (10:56 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Aug 2013 02:56:26 +0000 (10:56 +0800)

Trivial merge