[kde-baseapps/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 11f85853a60040b3f1acf49b93c616265b239b91
Merge: b74e70d 8daf2f1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 25 06:58:47 2014 -0500

    Merge branch 'master' into f20

 ...w-files-or-folders-inside-trash-to-be-add.patch |   32 +++++++++++++++++
 0002-Fix-scrollbar-appearing-on-FolderView.patch   |   37 ++++++++++++++++++++
 kde-baseapps.spec                                  |   10 +++++-
 3 files changed, 78 insertions(+), 1 deletions(-)
---