Merge branch 'MDL-36315' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 1 Nov 2012 02:02:47 +0000 (10:02 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 1 Nov 2012 02:02:47 +0000 (10:02 +0800)

Trivial merge