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

[Caolán McNamara]

commit 43659c8075b8a9ff4da6d117b665f11811a68884
Merge: 2138b2a 3b51559
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 28 17:14:35 2014 +0000

    Merge branch 'master' into f20

 ...bz-1007697-Update-on-a-Window-triggering-.patch |  168 ++++++++++++++++++++
 libreoffice.spec                                   |    8 +-
 2 files changed, 174 insertions(+), 2 deletions(-)
---