Merge commit 'HEAD@{1}' into develop

2014-12-08 21:53:00 +03:00 · 2014-12-08 21:53:00 +03:00 · 3fadacae97
parent 5cfbcd4813 6f999cb291
commit 3fadacae97
1 changed files with 2 additions and 2 deletions
--- a/docs/source/installation.rst
+++ b/docs/source/installation.rst
@ -5,8 +5,8 @@ Installation
 Generic requirements
 ====================

-* Python 2.6 or later, 3.2 or later, PyPy 2.0 or later. It is the only 
-  non-optional requirement.
+* Python 2.6 or later, 3.2 or later, PyPy 2.0 or later, PyPy3 2.3 or later. It 
+  is the only non-optional requirement.

  .. warning:
     It is highly advised to use UCS-4 version of Python because UCS-2 version