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

[hannes]

commit a2b62c83860e25ced84308e6e111b6e9b8b5ab78
Merge: 49c92ae 8b295ad
Author: hannes <hannes at fedoraproject.org>
Date:   Tue Nov 4 19:31:29 2014 +0100

    Merge branch 'master' into f20
    
    Update to 2.8.6

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