[libreoffice-TexMaths/f21: 6/6] Merge from master

[Orion Poplawski]

commit 852213913efedacc328cbbd11348217e497535f5
Merge: 507c73c 94ec2a2
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Oct 30 13:36:51 2014 -0600

    Merge from master

 .gitignore                |    1 +
 libreoffice-TexMaths.spec |   15 ++++++++++++---
 sources                   |    1 +
 3 files changed, 14 insertions(+), 3 deletions(-)
---