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

[Eike Rathke]

commit b601594d233ac7e5f71bbc7ff93da19148673d5f
Merge: ef9b9bf cda87c9
Author: Eike Rathke <erack at redhat.com>
Date:   Tue May 6 15:52:20 2014 +0100

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

 ...o-78128-go-back-to-using-an-interim-metaf.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---