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

[sbergmann]

commit b066b92fa2f5545f52c6d83df5aaf4055bab77d4
Merge: 2ae3c3f 54fdddb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 27 15:30:36 2014 +0100

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

 ...etProcessServiceFactory-must-be-called-be.patch |  139 ++++++++++++++++++++
 libreoffice.spec                                   |    6 +-
 2 files changed, 144 insertions(+), 1 deletions(-)
---