[libreoffice/f21: 2/2] Merge branch 'master' into f21

[Caolán McNamara]

commit 7722cd65a538934a11a1ac5ee5a71a285a9611b7
Merge: fbcd511 8484f73
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 20 09:48:47 2014 +0000

    Merge branch 'master' into f21

 ...disable-failing-while-libmwaw-fix-pending.patch |   12 +++
 libreoffice.spec                                   |   84 ++++++++++----------
 2 files changed, 55 insertions(+), 41 deletions(-)
---