Merge branch 'MDL-35603-import-limit' of git://github.com/rlorenzo/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 06:25:35 +0000 (14:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 06:25:35 +0000 (14:25 +0800)

Trivial merge