[texmaker/f19: 2/2] Merge branch 'master' into f19

[Deji Akingunola]

commit 62afe2a4c4f8f24623450949f0f87fb2fd23f7e4
Merge: d36aeb6 79120d8
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Tue Mar 4 15:00:06 2014 -0500

    Merge branch 'master' into f19

 .gitignore            |    1 +
 sources               |    2 +-
 texmaker-fedora.patch |   40 +++++++++++++++---------
 texmaker-qt-arm.patch |   78 -------------------------------------------------
 texmaker.spec         |    9 +++--
 5 files changed, 32 insertions(+), 98 deletions(-)
---