[filezilla/f21: 5/5] Merge branch 'master' into f21

[Nicolas Chauvet]

commit 54d28a4ff21e02317598ffcd774659f22b255c06
Merge: 81fc058 f76cea6
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Mon Oct 20 20:44:22 2014 +0200

    Merge branch 'master' into f21

 .gitignore     |    2 ++
 filezilla.spec |   16 +++++++++-------
 sources        |    2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)
---