Merge branch 'MDL-30884' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 07:19:15 +0000 (15:19 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 07:19:15 +0000 (15:19 +0800)

Trivial merge