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

[Caolán McNamara]

commit 2a7e4fcdbf1858a8f4791b28e424699315bf21eb
Merge: 9d26aa5 188f064
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 17 13:11:56 2014 +0100

    Merge branch 'master' into f20

 0001-Resolves-rhbz-1086714-overlarge-pixmap.patch |   34 +++++++++++++--------
 1 files changed, 21 insertions(+), 13 deletions(-)
---