[libreoffice/f20: 6/6] Merge branch 'master' into f20

[Caolán McNamara]

commit 30ebef3cce80a69d2e30b21c7a3f8c114c30e82e
Merge: e525dbb 7e6e58f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 16 10:24:21 2014 +0100

    Merge branch 'master' into f20

 ...o-36815-enable-printing-WYSIWYG-sidewindo.patch |  496 ++++++++++++++++++++
 libreoffice.spec                                   |   25 +-
 2 files changed, 516 insertions(+), 5 deletions(-)
---