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

[hannes]

commit 8b30255a36201a099d289bd3ac9a2f98e04b4f53
Merge: 37bbb28 adf54e6
Author: hannes <hannes at fedoraproject.org>
Date:   Fri Jan 11 19:01:43 2013 +0100

    Merge branch 'master' into f17
    
    Update to 2.5.2, includes various bugfixes

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