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

[Nicolas Chauvet]

commit c5fe93be4d7363a9c8b67d5df120f9d75f12d988
Merge: 207bdcd 1775c37
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Mon Jan 19 13:32:37 2015 +0100

    Merge branch 'master' into f21

 .gitignore     |    1 +
 filezilla.spec |    5 ++++-
 sources        |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---