Merge branch 'MDL-38735' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 01:59:01 +0000 (09:59 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 01:59:01 +0000 (09:59 +0800)

Trivial merge