[goffice/f13/master: 6/6] Merged with master

[belegdol]

commit 8f1655bec16b36b01269bd0d40aca38ceec03fa1
Merge: aa9f656 95666f3
Author: Julian Sikorski <belegdol at gmail.com>
Date:   Thu Aug 5 22:03:08 2010 +0200

    Merged with master

 .gitignore   |    3 ++-
 goffice.spec |    8 +++++++-
 sources      |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---