[seahorse: 4/4] Merge branch 'gnome-3-2'

[Stefan Walter <stefw src gnome org>]

commit ba2e70d228fd3a3d7319490f9adc9e9c9a7d67ab
Merge: ddc3620 0cb0d5a
Author: Stef Walter <stefw collabora co uk>
Date:   Thu Oct 20 10:22:13 2011 +0200

    Merge branch 'gnome-3-2'

 NEWS                        |    5 +
 configure.ac                |    2 +-
 help/gl/gl.po               | 1085 +++++++++++++++++++++++++++++++++++++++++++
 pgp/seahorse-gpgme-source.c |    6 +-
 4 files changed, 1093 insertions(+), 5 deletions(-)
---
diff --cc configure.ac
index d1ca6c5,0dd92aa..db40456
--- a/configure.ac
+++ b/configure.ac
@@@ -5,7 -5,7 +5,7 @@@ AC_PREREQ(2.52
  dnl ****************************************************************************
  dnl MAIN SEAHORSE VERSION (update after release)
  
- AC_INIT(seahorse, 3.2.0)
 -AC_INIT(seahorse, 3.2.1)
++AC_INIT(seahorse, 3.3.0)
  
  GCR_REQUIRED=3.1.5