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

[Caolán McNamara]

commit 5aaf0980b16f4cdb3996c4aaa05c59aca874ea08
Merge: 212a910 f90cfaf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 7 13:26:43 2013 +0100

    Merge branch 'master' into f19

 ...ves-rhbz-996162-apparent-NULL-bullet-font.patch |   34 ++++++++++++++++++++
 libreoffice.spec                                   |    3 ++
 2 files changed, 37 insertions(+), 0 deletions(-)
---