Merge branch 'MDL-44606-master' of http://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 May 2014 06:18:13 +0000 (14:18 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 May 2014 06:18:13 +0000 (14:18 +0800)

Trivial merge