Merge branch 'MDL-34934' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:46:42 +0000 (14:46 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:46:42 +0000 (14:46 +0800)

Trivial merge