Merge branch 'MDL-32535-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 May 2012 02:28:19 +0000 (10:28 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 May 2012 02:28:19 +0000 (10:28 +0800)

Trivial merge