[texstudio/f20: 5/5] Merge branch 'master' into f20

[hannes]

commit b121b06b28feebd842bb413e014e54907aada090
Merge: 51b1338 b75f477
Author: hannes <hannes at fedoraproject.org>
Date:   Mon Mar 23 20:31:39 2015 +0100

    Merge branch 'master' into f20
    
    Update to 2.9.2

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