Merge remote-tracking branch 'mailbox/mailbox-for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:18:06 +0000 (13:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:18:06 +0000 (13:18 +1100)

Trivial merge