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)
commitfdf90e24dc0bfb0a012d270c4929f324c899be9e
tree13987e2580b1d7e1a3026d59caea6d704034da2e
parent46046e0dc2a03b415cffe58da4bc353cfe56af2d
parent23a6de70b411084c3448974936c7324d154d5adb
Merge branch 'master' of git.lxde.org:/lxde/lxpanel

Conflicts:
po/fr.po
po/fr.po