Merge branch 'master' of git.lxde.org:/lxde/lxpanel
authorMartin Bagge <brother@bsnet.se>
Tue, 2 Dec 2014 10:34:59 +0000 (11:34 +0100)
committerMartin Bagge <brother@bsnet.se>
Tue, 2 Dec 2014 10:34:59 +0000 (11:34 +0100)
Conflicts:
po/fr.po

1  2 
po/fr.po

diff --cc po/fr.po
Simple merge