Merge branch 'MDL-39359_master' of https://github.com/pauln/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 05:45:50 +0000 (13:45 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 05:45:50 +0000 (13:45 +0800)

Trivial merge