Merge branch 'MDL-36732' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 07:17:46 +0000 (15:17 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 07:17:46 +0000 (15:17 +0800)

Trivial merge