Merge branch 'MDL-38011' of git://github.com/srynot4sale/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Apr 2013 06:58:53 +0000 (07:58 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Apr 2013 06:58:53 +0000 (07:58 +0100)

Trivial merge