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

[Caolán McNamara]

commit a72b96b488bf0d52162fab58416d68393a752ab7
Merge: 6dff004 ed42b79
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 25 12:23:28 2014 +0000

    Merge branch 'master' into f20

 ...z-1065807-rework-i66157-for-multiple-writ.patch |   50 ++++++++++----------
 ...bz-1065807-use-xdg-Templates-for-default-.patch |   36 ++++++--------
 ...list-common-lang-independant-template-dir.patch |    4 +-
 3 files changed, 43 insertions(+), 47 deletions(-)
---