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

[Caolán McNamara]

commit 9ef17d48ac06acf33659686afbc8de84ac179d16
Merge: 6165e73 a036373
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 13 13:40:54 2014 +0000

    Merge branch 'f20' into f19

 ...z-1047871-conditional-formatting-doesn-t-.patch |   87 ++++++++++++++++++++
 libreoffice.spec                                   |    5 +-
 2 files changed, 91 insertions(+), 1 deletions(-)
---