Merge branch 'MDL-37952' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 01:45:38 +0000 (09:45 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 01:45:38 +0000 (09:45 +0800)

Trivial merge