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

[Caolán McNamara]

commit d86c5e27f9a28fb22f46f8d5f1b562d7e7ac78ee
Merge: 3db6d96 9797d68
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Apr 12 12:35:54 2014 +0100

    Merge branch 'master' into f20

 ...hbz-1081176-don-t-jump-to-cursor-pos-when.patch |   35 +++++++++----------
 libreoffice.spec                                   |   27 +++++++++------
 2 files changed, 33 insertions(+), 29 deletions(-)
---