Merge branch 'MDL-36897' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 13 Dec 2012 01:54:17 +0000 (09:54 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 13 Dec 2012 01:54:17 +0000 (09:54 +0800)

Trivial merge