[libreoffice/f19: 7/7] Merge branch 'master' into f19

[Caolán McNamara]

commit 110579850a9d1fd6f693337e82ab4094696828bd
Merge: 3e55f33 0fbb140
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 3 12:50:02 2013 +0100

    Merge branch 'master' into f19

 0001-Make-charmap.cxx-compile-with-icu-4.4.patch   |   27 +++++-
 ...bz-993963-NULL-m_pWindow-on-firefox-delet.patch |   27 +++++
 libreoffice-rhel6gcj.patch                         |  108 ++++++++++++++++++++
 libreoffice-rhel6poppler.patch                     |   14 +++
 libreoffice.spec                                   |   17 +++-
 5 files changed, 186 insertions(+), 7 deletions(-)
---