Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 08:47:15 +0000 (16:47 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 08:47:15 +0000 (16:47 +0800)

Trivial merge