Merge branch 'MDL-39339_master' of https://github.com/pauln/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Jun 2013 05:10:24 +0000 (13:10 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Jun 2013 05:10:24 +0000 (13:10 +0800)

Trivial merge