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:51:12 +0000 (15:51 +0200)
committerMartin Bagge / brother (or Pootle...) <brother@bsnet.se>
Tue, 6 Apr 2010 13:51:12 +0000 (15:51 +0200)
commit8e63ead504bc21437110e94f0a169c1f937ee82d
tree5a200cef8b04893fc99ade36463f106660325cfb
parentac4bb2f362be708924783354f8b5771ea443ded2
parent1ccada0148452d5a8b873a7086a194c0262acc27
Merge branch 'master' of git://lxde.git.sourceforge.net/gitroot/lxde/lxtask

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