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

[David Tardon]

commit 03c1f8c27437387d116cd4ffa9bb977c35f165d8
Merge: 7cf28c3 4a30b7c
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 27 16:46:48 2014 +0100

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

 .gitignore       |    3 +++
 libreoffice.spec |    7 +++++--
 sources          |    6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)
---