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

[Nicolas Chauvet]

commit ea4a9f87158c416da92158d123bb6258030ef280
Merge: ae69390 78527a2
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Thu Mar 12 22:45:04 2015 +0100

    Merge branch 'master' into f21

 filezilla.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---