Merge remote-tracking branch 'upstream/master'

Author: nvie

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
   - "3.3"
   - "3.4"

doc/source/changes.rst

@@ -7,7 +7,7 @@ Changelog
 
 * `Commit.diff()` now supports diffing the root commit via `Commit.diff(NULL_TREE)`.
 * `Repo.blame()` now respects `incremental=True`, supporting incremental blames.  Incremental blames are slightly faster since they don't include the file's contents in them.
-
+* IMPORTANT: This release drops support for python 2.6, which is officially deprecated by the python maintainers.
 
 1.0.2 - Fixes
 =============

setup.py

@@ -110,7 +110,6 @@ def _stamp_version(filename):
         "Operating System :: MacOS :: MacOS X",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",