[gnome-documents: 9/10] Merge commit '7494467046401301a4c6b3418386e68391f56ce4'

[Adam Williamson]

commit 05c1587889a126c12ffd62d30a241f63d7b63e0c
Merge: 29318d3 7494467
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Mar 20 15:10:10 2012 -0700

    Merge commit '7494467046401301a4c6b3418386e68391f56ce4'

 .gitignore                   |    3 ++
 fix-translations-again.patch |   52 ++++++++++++++++++++++++++++++++++++++++++
 gnome-documents.spec         |   25 +++++++++++++++++--
 sources                      |    2 +-
 4 files changed, 78 insertions(+), 4 deletions(-)
---