Merge branch 'MDL-53147-inbox-layout' of https://github.com/brendanheywood/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Mar 2016 03:38:47 +0000 (11:38 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Mar 2016 03:38:47 +0000 (11:38 +0800)

Trivial merge