From: Rob Golding <rob@robgolding.com>
Date: Sun, 3 Nov 2013 21:19:45 +0000 (+0000)
Subject: Merge branch 'master' of github.com:robgolding63/tasklib
X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/fdaab163072cb27edfef3bd00272449cfa618179?ds=sidebyside;hp=--cc

Merge branch 'master' of github.com:robgolding63/tasklib

Conflicts:
	tasklib/tests.py
---

fdaab163072cb27edfef3bd00272449cfa618179