Merge branch 'MDL-39552' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 May 2013 12:03:58 +0000 (13:03 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 May 2013 12:03:58 +0000 (13:03 +0100)

Trivial merge