Merge branch 'MDL-38766/master' of github.com:kemitix/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 02:37:23 +0000 (10:37 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 02:37:23 +0000 (10:37 +0800)

Trivial merge