Rev 148: Merge the 0.2 branch, open as 0.2.2-dev in http://bazaar.launchpad.net/~meliae-dev/meliae/trunk

[John Arbash Meinel]

At http://bazaar.launchpad.net/~meliae-dev/meliae/trunk

------------------------------------------------------------
revno: 148 [merge]
revision-id: john at arbash-meinel.com-20100630221531-5ghm9cecngqkjf5q
parent: john at arbash-meinel.com-20100630220725-hggdvjum3fn1ab2a
parent: john at arbash-meinel.com-20100630221019-h0f8ymzu6yj6af8r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: trunk
timestamp: Wed 2010-06-30 17:15:31 -0500
message:
  Merge the 0.2 branch, open as 0.2.2-dev
modified:
  CHANGES.txt                    changes.txt-20100104131503-ipkk7tyh2bnv0lu4-1
  meliae/__init__.py             __init__.py-20090401185017-cy1sj2rnyn6z7haz-4
-------------- next part --------------
=== modified file 'CHANGES.txt'
--- a/CHANGES.txt	2010-06-30 21:44:55 +0000
+++ b/CHANGES.txt	2010-06-30 22:15:31 +0000
@@ -5,10 +5,16 @@
 .. contents:: List of Releases
    :depth: 1
 
+Meliae 0.2.2
+############
+
+:0.2.2: (not released yet)
+
+
 Meliae 0.2.1rc1
 ###############
 
-:0.2.1rc1: (not released yet)
+:0.2.1rc1: 2010-06-30
 
 * Avoid calling ``PyType_Type.tp_traverse`` when the argument is not a
   heap-class. There is an assert that gets tripped if you are running a

=== modified file 'meliae/__init__.py'
--- a/meliae/__init__.py	2010-01-08 23:07:14 +0000
+++ b/meliae/__init__.py	2010-06-30 22:15:31 +0000
@@ -14,6 +14,6 @@
 
 """A simple way to dump memory consumption of a running python program."""
 
-version_info = (0, 2, 1, 'dev', 0)
+version_info = (0, 2, 2, 'dev', 0)
 __version__ = '.'.join(map(str, version_info))