From: Rob Golding <rob@robgolding.com>
Date: Sun, 31 Jan 2016 18:28:10 +0000 (+0000)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/a2447bf8728f9cd3441628e7f59cbd8828989cba

Merge branch 'master' into develop
---

a2447bf8728f9cd3441628e7f59cbd8828989cba
diff --cc .travis.yml
index 721c530,7d2ce8f..f579787
--- a/.travis.yml
+++ b/.travis.yml
@@@ -9,13 -9,13 +9,13 @@@ env
    - TASK_VERSION=v2.4.2
    - TASK_VERSION=v2.4.3
    - TASK_VERSION=v2.4.4
 -  - TASK_VERSION=2.5.0
 +  - TASK_VERSION=v2.5.0
-   - TASK_VERSION=2.5.1
++  - TASK_VERSION=v2.5.1
  python:
 -  - "2.6"
    - "2.7"
 -  - "3.2"
    - "3.3"
    - "3.4"
 +  - "3.5"
  install:
    - pip install -e .
    - pip install coveralls