[libreoffice/f19: 2/2] Merge branch 'f20' into f19

[Caolán McNamara]

commit 9efa358c9d2ae7698c92a1e395a6db3b68412c01
Merge: ad36c9a f6c38ec
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 24 17:23:07 2014 +0000

    Merge branch 'f20' into f19

 0001-update-libmwaw-to-0.2.0.patch |   17 ++++++++++++++---
 libreoffice.spec                   |    2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)
---