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

[hannes]

commit 624e4dc5122c36e5f291e417dcf43edf6c4586a6
Merge: 8da437d 867508c
Author: hannes <hannes at fedoraproject.org>
Date:   Tue Jan 20 19:45:23 2015 +0100

    Merge branch 'master' into f20
    
    Fix for bug 1167048

 texstudio.desktop |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---