Merge stable branch from trunk


git-svn-id: https://svn.apache.org/repos/asf/incubator/tashi/branches/stable@1241776 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/tashi/version.py b/src/tashi/version.py
index 5a64ca1..1fd7997 100644
--- a/src/tashi/version.py
+++ b/src/tashi/version.py
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.    
 
-version = "HEAD"
+version = "201202"
diff --git a/src/zoni/version.py b/src/zoni/version.py
index ea515d5..0561fa8 100644
--- a/src/zoni/version.py
+++ b/src/zoni/version.py
@@ -20,5 +20,5 @@
 lastChangeRevision = "$Rev: 964467 $"
 revision = lastChangeRevision
 #version="$LastChangedDate$"
-version = "HEAD"
+version = "201111"