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

[Caolán McNamara]

commit 4ae3fb3b16b9e419c00e7cebb3da8e07ec5fd91c
Merge: 6930dd6 eb8b9ba
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 26 14:08:10 2014 +0000

    Merge branch 'master' into f20

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