Merge branch 'MDL-36679-master' of github.com:damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 07:25:20 +0000 (15:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 07:25:20 +0000 (15:25 +0800)

Trivial merge