Merge branch 'MDL-37547-master' of github.com:damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Jan 2013 07:58:34 +0000 (15:58 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Jan 2013 07:58:34 +0000 (15:58 +0800)

Trivial merge