Merge branch 'master' of git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm
authorMartin Bagge / brother <brother@bsnet.se>
Sun, 30 Sep 2012 21:00:46 +0000 (23:00 +0200)
committerMartin Bagge / brother <brother@bsnet.se>
Sun, 30 Sep 2012 21:00:46 +0000 (23:00 +0200)
commit98299a583b084927cd0240e7b088c7aac567c8e2
tree1e2b1202a3414d6cc4158f871eae4163ed4d2f4a
parent343527e418df110e89a5f7e1e2a1edd547395fbe
parentbc132e33888012646969fcb75b01b74ea81a5b8d
Merge branch 'master' of git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm