Merge branch 'MDL-48047-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 12:05:58 +0000 (12:05 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 12:05:58 +0000 (12:05 +0000)

Trivial merge