Merge branch 'release/v0.6.0' into develop

CONTRIBUTORS.txt

@@ -4,4 +4,7 @@ Ace Kwok / @doraemonext
 @JohnnyZhao
 @svcvit
 @mtunique
-@lvxudong
+@lvxudong
+@colesmith
+@paicha
+@torpedoallen

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014, Ace Kwok
+Copyright (c) 2014-2016, Ace Kwok
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

docs/.gitignore

@@ -0,0 +1 @@
+site/

docs/docs/about/author.md

@@ -17,12 +17,15 @@
 
 ## Contributors
 
-以下排名按首字母排序。
+以下排名按贡献数排序。
 
 * JohnnyZhao ([https://github.com/JohnnyZhao](https://github.com/JohnnyZhao))
-* lvxudong ([https://github.com/lvxudong](https://github.com/lvxudong))
-* mtunique ([https://github.com/mtunique](https://github.com/mtunique))
 * svcvit ([https://github.com/svcvit](https://github.com/svcvit))
+* colesmith ([https://github.com/colesmith](https://github.com/colesmith))
 * yxjsolid ([https://github.com/yxjsolid](https://github.com/yxjsolid))
+* lvxudong ([https://github.com/lvxudong](https://github.com/lvxudong))
+* mtunique ([https://github.com/mtunique](https://github.com/mtunique))
 * zxygentoo ([https://github.com/zxygentoo](https://github.com/zxygentoo))
+* paicha ([https://github.com/paicha](https://github.com/paicha))
+* torpedoallen ([https://github.com/torpedoallen](https://github.com/torpedoallen))
 

docs/mkdocs.yml

@@ -3,13 +3,13 @@ theme: yeti
 
 site_url: http://wechat-python-sdk.com
 repo_url: https://github.com/wechat-python-sdk
-copyright: 2014-2016 Ace Kwok
+copyright: Copyright 2014-2016 Ace Kwok
 markdown_extensions:
     - toc:
         permalink: True
 
 extra:
-  'version': 'v0.6.0 (20160201)'
+  'version': 'v0.6.0 (20160204)'
 
 pages:
   - '首页': 'index.md'

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='wechat-sdk',
-    version='0.5.9',
+    version='0.6.0',
     keywords=('wechat', 'sdk', 'wechat sdk'),
     description=u'微信公众平台Python开发包',
     long_description=open("README.rst").read(),