[libreoffice/f20: 2/2] Merge remote-tracking branch 'origin/master' into f20

[Eike Rathke]

commit ef9b9bfa1eabcda35a81d4cb32c8fc0c8baa2bab
Merge: 641f69c 0ddcb19
Author: Eike Rathke <erack at redhat.com>
Date:   Tue May 6 12:18:24 2014 +0100

    Merge remote-tracking branch 'origin/master' into f20

 ...o-78294-default-null-date-for-document-im.patch |   51 ++++++++++++++++++++
 libreoffice.spec                                   |    6 ++-
 2 files changed, 56 insertions(+), 1 deletions(-)
---