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

[Caolán McNamara]

commit 6dff00415c9c79521ab9de49e586aad7e5d1b38f
Merge: 8c3a79f e12435c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 25 10:57:00 2014 +0000

    Merge branch 'master' into f20

 ...bz-1065807-use-xdg-Templates-for-default-.patch |  202 ++++++++++++++++++++
 ...list-common-lang-independant-template-dir.patch |   25 +++
 2 files changed, 227 insertions(+), 0 deletions(-)
---