Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Feb 2013 07:47:27 +0000 (15:47 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Feb 2013 07:47:27 +0000 (15:47 +0800)

Trivial merge