Merge commit '288a3c43354cd2f36837be9f58160ca14454d63f'

Marshall Jones · Marshall Jones · commit ee613d437392 · 2013-06-18T08:47:25.000-07:00
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,3 @@
-include README.mkd
+include README.md
 include requirements.txt
 include test-requirements.txt
diff --git a/README.md b/README.md
diff --git a/balanced/__init__.py b/balanced/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.11.5'
+__version__ = '0.11.6'
 from collections import defaultdict
 import contextlib
 
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 """
 Balanced Python client library.
 
-See ``README.mkd`` for usage advice.
+See ``README.md`` for usage advice.
 """
 import os
 import pickle
@@ -73,7 +73,7 @@ def _get_version():
 
 
 def _get_long_description():
-    path = os.path.join(PATH_TO_FILE, 'README.mkd')
+    path = os.path.join(PATH_TO_FILE, 'README.md')
     fo = open(path)
     try:
         return fo.read()

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = '0.11.5'`
	`1`	`+__version__ = '0.11.6'`
`2`	`2`	`from collections import defaultdict`
`3`	`3`	`import contextlib`
`4`	`4`