Merged from stable to default

Author: Menno Smits

.hgtags

@@ -24,3 +24,4 @@ b1f516b3b41579a18793171728a65e956dbc7d0e 0.10.1
 c076ec55a74f8ae8195dbac440fd0c83b89eafb8 0.13
 743bdffc5a3608fcba1261a27d82ba51132ee1d3 1.0.0
 36f7e81f7fe2c15c71512c30fbce5df6914edc83 1.0.1
+c3dd941a683bcba1edb45ff2155422b6275d8b32 1.0.2

setup.py

@@ -40,7 +40,7 @@
     * Convenience methods are provided for commonly used functionality.
     * Exceptions are raised when errors occur.
 
-Python versions 2.6, 2.7, 3.3 and 3.4 are officially supported.
+Python versions 2.6, 2.7, 3.3, 3.4 and 3.5 are officially supported.
 
 IMAPClient includes comprehensive units tests and automated
 functional tests that can be run against a live IMAP server.