Merge branch 'master' of git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm
authorMartin Bagge / brother (or Pootle...) <brother@bsnet.se>
Mon, 14 Feb 2011 14:30:18 +0000 (15:30 +0100)
committerMartin Bagge / brother (or Pootle...) <brother@bsnet.se>
Mon, 14 Feb 2011 14:30:18 +0000 (15:30 +0100)
commit1825c9424a81b995369f8bb1381605cf83acd26c
treef7e990137d113a4b1c7bf822baa72a19f73a6788
parentdc13ab16ffe8edd77e6444729424d2aba60a12fd
parentcac3de08801358dc4fb7ddf67bd724c784512a8b
Merge branch 'master' of git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm

Conflicts:
po/sl.po
po/sl.po