Merge branch 'MDL-33952-master-fix2' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Jan 2014 01:40:58 +0000 (09:40 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jan 2014 01:40:58 +0000 (09:40 +0800)

Trivial merge