# HG changeset patch
# User bsw
# Date 1341351326 -7200
# Node ID 473800fd491da4a5165a77f30fb2608fa4d46b92
# Parent  63cb12b3f1f2e9979c63a7f0751a24af55df4da8# Parent  7742c4d3102037ec6efd074d90cdd8a3a4e31532
merge

diff -r 63cb12b3f1f2 -r 473800fd491d .hgtags
--- a/.hgtags	Tue Jul 03 23:34:06 2012 +0200
+++ b/.hgtags	Tue Jul 03 23:35:26 2012 +0200
@@ -75,3 +75,4 @@
 f5c6d8b75ec348911e2edcbdbf8191822c29efcf v2.0.0-rc1
 f7b21855d7d15ed4adecabf17c75b744401bd961 v2.0.0-rc2
 e32827e5d304c7379da8d6b221b06acaf38ac197 v2.0.0-rc3
+82bbab02dd954bd05984d610a96e33096195246c v2.0.0
diff -r 63cb12b3f1f2 -r 473800fd491d config/init.lua
--- a/config/init.lua	Tue Jul 03 23:34:06 2012 +0200
+++ b/config/init.lua	Tue Jul 03 23:35:26 2012 +0200
@@ -3,7 +3,7 @@
 -- (except when you really know what you are doing!)
 -- ========================================================================
 
-config.app_version = "2.0.0-rc3"
+config.app_version = "2.0.0"
 
 if config.enabled_languages == nil then
   config.enabled_languages = { 'en', 'de', 'eo', 'el', 'hu' }