bump version, add a bit to changelog

CHANGELOG

@@ -6,6 +6,8 @@ Changes between 1.3.4 and 2.0.0dev0
   by default setup.cfg and tox.ini files are searched.  The old
   ways (certain environment variables, dynamic conftest.py reading 
   is removed).
+- add a new "-q" option which decreases verbosity and prints a more
+  nose/unittest-style "dot" output.
 - fix issue126 - introduce py.test.set_trace() to trace execution via
   PDB during the running of tests even if capturing is ongoing.
 - fix issue123 - new "python -m py.test" invocation for py.test
@@ -30,6 +32,7 @@ Changes between 1.3.4 and 2.0.0dev0
 - fix bug: unittest collected functions now also can have "pytestmark"
   applied at class/module level
 
+
 Changes between 1.3.3 and 1.3.4
 ----------------------------------------------
 

pytest/__init__.py

@@ -5,7 +5,7 @@ see http://pytest.org for documentation and details
 
 (c) Holger Krekel and others, 2004-2010
 """
-__version__ = '2.0.0.dev11'
+__version__ = '2.0.0.dev12'
 
 __all__ = ['config', 'cmdline']
 

setup.py

@@ -22,7 +22,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.0.0.dev11',
+        version='2.0.0.dev12',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],