Merge branch 'MDL-38039_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 07:59:48 +0000 (15:59 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 07:59:48 +0000 (15:59 +0800)

Trivial merge