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

[Caolán McNamara]

commit b4a5f57a5319bf1ea647ee9db75e79d69b98d169
Merge: 14ab788 54ad1d4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 22 14:21:18 2013 +0000

    Merge branch 'f20' into f19

 ...rite-Qt4-based-nested-yield-mutex-locking.patch |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)
---