Merge branch 'MDL-39029' of git://github.com/jacks92/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Apr 2013 12:30:10 +0000 (13:30 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Apr 2013 12:30:10 +0000 (13:30 +0100)

Trivial merge