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

[Caolán McNamara]

commit 6de4bcd482efe133dc304ccb498279b1b8d81a9d
Merge: 1f9eb79 5edfb62
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 5 14:56:45 2014 +0000

    Merge branch 'master' into f21
    
    Conflicts:
    	libreoffice.spec

 ...o-37559-revert-adding-extra-dummy-polygon.patch |   73 ++++++++++++++++++++
 libreoffice.spec                                   |    6 ++-
 2 files changed, 78 insertions(+), 1 deletions(-)
---