[gnote/gnome-3-6] Prepare 3.6.1

[Aurimas Äernius <aurimasc src gnome org>]

commit a7b6df1e59301d29a4657470ff209ca7f12c389d
Author: Aurimas Äernius <aurisc4 gmail com>
Date:   Sun Oct 28 18:33:42 2012 +0200

    Prepare 3.6.1

 NEWS |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/NEWS b/NEWS
index 70c5574..bcf318c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+3.6.1 "When we talk of tomorrow, the gods laugh" - 2012/10/28
+
+Fixes:
+  * Fix build on GCC 4.2 (#684931)
+  * Fix runtime warning with markup in fixed width addin
+
+Translations:
+  * Updated translations:
+    - German (de)
+  * Updated Spanish manual (es)
+
 3.6.0 "Good cooking takes time" - 2012/09/26
 
 New Features: