[merlot] 2 new revisions pushed by esar...@gmail.com on 2012-03-19 01:44 GMT

[mer...@googlecode.com]

2 new revisions:

Revision: 6ed99d3b6d82
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 18:43:00 2012
Log: Preparing release.
http://code.google.com/p/merlot/source/detail?r=6ed99d3b6d82

Revision: bcfcbd51568e
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 18:44:23 2012
Log: Added tag 0.2 for changeset 6ed99d3b6d82
http://code.google.com/p/merlot/source/detail?r=bcfcbd51568e

==============================================================================
Revision: 6ed99d3b6d82
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 18:43:00 2012
Log: Preparing release.
http://code.google.com/p/merlot/source/detail?r=6ed99d3b6d82

Modified:
/docs-source/changelog.rst
/docs-source/conf.py

=======================================
--- /docs-source/changelog.rst Sun Mar 18 18:23:49 2012
+++ /docs-source/changelog.rst Sun Mar 18 18:43:00 2012
@@ -8,7 +8,7 @@
* Silvestre Huens (quimera)
* Juan A. Diaz (nueces)

-**0.2 - unreleased**
+**0.2 - 2012-03-18**

* Upgraded Grok version to 1.4.1. [emanuel]
* Added Japanese translation contributed by OCHIAI Gouji. [emanuel]
=======================================
--- /docs-source/conf.py Sun Mar 18 13:25:45 2012
+++ /docs-source/conf.py Sun Mar 18 18:43:00 2012
@@ -56,7 +56,7 @@
# The short X.Y version.
version = '0.2'
# The full version, including alpha/beta/rc tags.
-release = '0.2dev'
+release = '0.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

==============================================================================
Revision: bcfcbd51568e
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 18:44:23 2012
Log: Added tag 0.2 for changeset 6ed99d3b6d82
http://code.google.com/p/merlot/source/detail?r=bcfcbd51568e

Modified:
/.hgtags

=======================================
--- /.hgtags Fri Mar 25 16:07:41 2011
+++ /.hgtags Sun Mar 18 18:44:23 2012
@@ -3,3 +3,4 @@
0000000000000000000000000000000000000000 0.1
0000000000000000000000000000000000000000 0.1
787858b43b07a94ae8d56513a00a48aeda8bbbc7 0.1
+6ed99d3b6d82503e3216230d81a5340ac71535fe 0.2