Merge branch 'Alvarito050506-patch-1'
authorYao Wei (魏銘廷) <mwei@lxde.org>
Sun, 25 Feb 2018 07:20:21 +0000 (15:20 +0800)
committerYao Wei (魏銘廷) <mwei@lxde.org>
Sun, 25 Feb 2018 07:20:21 +0000 (15:20 +0800)

Trivial merge