[libreoffice/f20: 2/2] Merge remote-tracking branch 'origin/master' into f20

[David Tardon]

commit 8478143fefce6d6b28b6b9edb89dc7f297c03890
Merge: 17b7d08 42ee36e
Author: David Tardon <dtardon at redhat.com>
Date:   Sat May 10 15:23:29 2014 +0200

    Merge remote-tracking branch 'origin/master' into f20

 ...hbz-1071604-don-t-paint-anim.-effect-icon.patch |   31 ++++++++++++++++++++
 libreoffice.spec                                   |    1 +
 2 files changed, 32 insertions(+), 0 deletions(-)
---