Merge branch 'MDL-39006' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Apr 2013 03:14:03 +0000 (11:14 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Apr 2013 03:14:03 +0000 (11:14 +0800)

Trivial merge