[qt-creator/f20: 4/4] Merge branch 'master' into f20

[Sandro Mani]

commit bc6ef445f4e004b752c8e6182d1125d93609df6d
Merge: 21a5ecf 7e6b8e6
Author: Sandro Mani <manisandro at gmail.com>
Date:   Thu Feb 6 15:29:26 2014 +0100

    Merge branch 'master' into f20

 .gitignore      |    1 +
 qt-creator.spec |   17 ++++++++++-------
 sources         |    2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)
---