[seahorse: 7/7] Merge branch 'gnome-3-6'

[Stefan Walter <stefw src gnome org>]

commit 616864a602e5fb413cdf2d9bf2dd6bdc2f0e1882
Merge: b2e0fd5 0af7c55
Author: Stef Walter <stefw gnome org>
Date:   Wed Nov 21 18:07:09 2012 +0100

    Merge branch 'gnome-3-6'

 NEWS |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --cc NEWS
index e027876,7b3f624..01fe59f
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,15 +1,22 @@@
 +seahorse 3.7.1
 +--------------
 +
 + * Fix problem where keyring items overwrite one another
 + * Correct capitalization of ElGamal
 + * Build fixes
 +
+ seahorse 3.6.3
+ --------------
+ 
+  * Display item labels even if they don't match formatters
+  * Fix crashers
+  * Updated translations
+ 
+ seahorse 3.6.2
+ --------------
+ 
+  * Fix problem where keyring items overwrite one another
+ 
  seahorse 3.6.1
  --------------