Merge branch 'master' of git://lxde.git.sourceforge.net/gitroot/lxde/lxtask
authorMartin Bagge / brother (or Pootle...) <brother@bsnet.se>
Tue, 6 Apr 2010 13:50:43 +0000 (15:50 +0200)
committerMartin Bagge / brother (or Pootle...) <brother@bsnet.se>
Tue, 6 Apr 2010 13:50:43 +0000 (15:50 +0200)
commitac4bb2f362be708924783354f8b5771ea443ded2
treec865793b537a19d53e35db788b9b46daca2f9613
parentb2602ef494bb0cff4be99352fa84fc48491fd7d5
parentb3bb2ec3104c269a63ea85db49797fc5bf8c469a
Merge branch 'master' of git://lxde.git.sourceforge.net/gitroot/lxde/lxtask

Conflicts:
po/fa.po
po/fa.po