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

[David Tardon]

commit 2ae3c3f3b4275dff54807841ce7f3f4b64abef84
Merge: 4ae3fb3 dbb1496
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 27 10:27:07 2014 +0100

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

 ...1057977-avoid-use-of-invalidated-pointers.patch |  156 ++++++++++++++++++++
 libreoffice.spec                                   |    8 +-
 2 files changed, 162 insertions(+), 2 deletions(-)
---