Merge branch 'MDL-32076_unlimited2' of git://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 06:30:07 +0000 (14:30 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 06:30:07 +0000 (14:30 +0800)

Trivial merge