Merge branch 'MDL-33126-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 May 2012 12:17:12 +0000 (20:17 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 May 2012 12:17:12 +0000 (20:17 +0800)

Trivial merge