Merge branch 'MDL-34707' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 06:41:53 +0000 (14:41 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 06:41:53 +0000 (14:41 +0800)

Trivial merge