[file/f21: 3/3] Merge branch 'master' into f21

[Jan Kaluža]

commit 14735078d8e51e8d62ab3fc53da131973fa8c7d1
Merge: 67ac402 7da30d3
Author: Jan Kaluza <jkaluza at redhat.com>
Date:   Wed Sep 3 11:49:27 2014 +0200

    Merge branch 'master' into f21

 file-5.19-cafebabe.patch       |   44 ++++++++++++++++++++++++++++++++++++++++
 file-5.19-locale-archive.patch |   11 ++++++++++
 file-5.19-msooxml.patch        |   22 ++++++++++++++++++++
 file-5.19-pascal.patch         |   29 ++++++++++++++++++++++++++
 file-5.19-python-3.4.patch     |   24 +++++++++++++++++++++
 file.spec                      |   21 ++++++++++++++++++-
 6 files changed, 150 insertions(+), 1 deletions(-)
---