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

[Eike Rathke]

commit 17b7d08845245c054143aa418bc71a14a6de0b15
Merge: 9442cf1 092ba3b
Author: Eike Rathke <erack at redhat.com>
Date:   Fri May 9 18:06:10 2014 +0200

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

 ...-a-status-bar-icon-to-fit-slide-to-window.patch |    2 +-
 ...4-don-t-crash-if-slide-layout-configs-are.patch |   69 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++-
 3 files changed, 76 insertions(+), 2 deletions(-)
---