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

[Caolán McNamara]

commit 6930dd6bcdffd171cb7675a6557c31d9e1ea0be3
Merge: a72b96b e367df4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 25 16:04:16 2014 +0000

    Merge branch 'master' into f20

 ...z-1065807-rework-i66157-for-multiple-writ.patch |   27 +++++++++++++------
 1 files changed, 18 insertions(+), 9 deletions(-)
---