Merge branch 'master' of git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm
authorMartin Bagge / brother <brother@bsnet.se>
Tue, 23 Oct 2012 21:03:01 +0000 (23:03 +0200)
committerMartin Bagge / brother <brother@bsnet.se>
Tue, 23 Oct 2012 21:03:01 +0000 (23:03 +0200)
commit468298fd8321bd653f2933ddde2dc42a5536e8b2
treed2e6815dd4f850dbd92fd7b452b7d9b28c66cf0e
parent0b0281492833f645b0845ed8aaf864d3fda50fbe
parentadd1a716807ea40a48f789e766dfa21eafbd340b
Merge branch 'master' of git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm