Merge branch 'master' of ssh://git.code.sf.net/p/lxde/lxpanel
authorMartin Bagge <brother@bsnet.se>
Wed, 26 Mar 2014 09:58:34 +0000 (10:58 +0100)
committerMartin Bagge <brother@bsnet.se>
Wed, 26 Mar 2014 09:58:34 +0000 (10:58 +0100)

Trivial merge