Merge branch 'MDL-37546-master' of github.com:damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 05:49:34 +0000 (13:49 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 05:49:34 +0000 (13:49 +0800)

Trivial merge