[libreoffice/f19: 3/3] Merge remote-tracking branch 'origin/master' into f19

[David Tardon]

commit 78bc2df3905289096ccb4bf8434a29d59e00b48f
Merge: 0197b5e e21dcd9
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jul 24 15:04:18 2013 +0200

    Merge remote-tracking branch 'origin/master' into f19

 .gitignore                                         |    3 +
 ...o-66924-switching-to-master-view-is-broke.patch |   76 ------
 0001-move-static-bitmap-into-a-svapp-member.patch  |  183 +++++++++++++
 ...o-67094-handle-text-s-in-text-p-and-text-.patch |  286 ++++++++++++++++++++
 libreoffice.spec                                   |   17 +-
 sources                                            |    6 +-
 6 files changed, 486 insertions(+), 85 deletions(-)
---