Merge branch 'MDL-34640' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 05:57:02 +0000 (13:57 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 05:57:02 +0000 (13:57 +0800)

Trivial merge