Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jun 2012 07:55:54 +0000 (15:55 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jun 2012 07:55:54 +0000 (15:55 +0800)

Trivial merge