Merge branch 'MDL-39054' of git://github.com/jacks92/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 03:08:28 +0000 (11:08 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 03:08:28 +0000 (11:08 +0800)

Trivial merge