Merge branch 'MDL-37143-master' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Jan 2013 07:34:29 +0000 (15:34 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Jan 2013 07:34:29 +0000 (15:34 +0800)

Trivial merge