Merge branch 'master_MDL-39239' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 12 Jun 2013 08:49:29 +0000 (16:49 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 12 Jun 2013 08:49:29 +0000 (16:49 +0800)

Trivial merge