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

[Caolán McNamara]

commit 9f5e6ad31c40ea28b2860391aff9daad8fd0f687
Merge: 78bc2df 213dc35
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 26 11:22:08 2013 +0100

    Merge branch 'master' into f19

 libreoffice.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---