Merge branch 'MDL-38637-master' of github.com:StudiUM/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 02:08:45 +0000 (10:08 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 02:08:45 +0000 (10:08 +0800)

Trivial merge