[tali/mallard-help: 6/31] 3.12.2

[Rashi Aswani <aswanirashi src gnome org>]

commit 596fcecc23ef7a087a71becd4533c83a1ac5b2e7
Author: Mario Wenzel <maweki gmail com>
Date:   Mon May 12 20:55:05 2014 +0200

    3.12.2

 NEWS |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/NEWS b/NEWS
index 4bd832b..e0540b4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,17 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 Tali 3.13.1
 ===========
 
 * Translation updates (Basque, Slovenian, Greek)
 =======
+=======
+Tali 3.12.2
+===========
+
+* Translation updates (Catalan (Valencian), Indonesian, Catalan, Greek)
+
+>>>>>>> 3.12.2
 Tali 3.12.1
 ===========