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

[Caolán McNamara]

commit 2138b2aa6b15a076df81e8442ad67f119682521e
Merge: 03c1f8c 2d70aeb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 28 08:58:32 2014 +0000

    Merge branch 'master' into f20

 0001-KDE-don-t-throw-on-TemplatePathVariable.patch |   51 ++++++++++++++++++++
 libreoffice.spec                                   |   12 +++--
 2 files changed, 59 insertions(+), 4 deletions(-)
---