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

[hannes]

commit f14431abf9bd5917b10afcc2499a81f10620ca9d
Merge: f551f45 8d581aa
Author: hannes <hannes at fedoraproject.org>
Date:   Sat Oct 27 11:07:51 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	sources
    
    merged master

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---