Merge branch 'master_MDL-37393' of github.com:danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Aug 2013 04:57:34 +0000 (12:57 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Aug 2013 04:57:34 +0000 (12:57 +0800)

Trivial merge