Merge branch 'MDL-34957_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:23:22 +0000 (14:23 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:23:22 +0000 (14:23 +0800)

Trivial merge