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

[Caolán McNamara]

commit a3014ab6af01e2ed7b228fa84b1d220454ad98bf
Merge: bc68190 b903b6f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 4 13:37:32 2014 +0000

    Merge branch 'master' into f20

 ...arch-for-wizards-dir-in-all-internal-temp.patch |   59 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++-
 2 files changed, 65 insertions(+), 1 deletions(-)
---