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

[David Tardon]

commit a1172b0d7b25e5df0d9ffab08dc0806ef2e47e77
Merge: 9f5e6ad 319ddc4
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jul 30 07:10:41 2013 +0200

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

 ...Use-inconditionally-the-libwpd-0.9.5-path.patch |   50 ++++++++++++++++++++
 0001-sanitize-system-clucene-includes.patch        |   34 +++++++++++++
 libreoffice.spec                                   |   12 ++++-
 3 files changed, 95 insertions(+), 1 deletions(-)
---