From: Rob Golding <rob@robgolding.com>
Date: Thu, 15 Jan 2015 13:40:47 +0000 (+0000)
Subject: Merge branch 'develop' into deserialized-data-dict
X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/d4ee441b2352dd50f00363c1ccb123e25cbac248?ds=inline;hp=d4ee441b2352dd50f00363c1ccb123e25cbac248

Merge branch 'develop' into deserialized-data-dict

Conflicts:
	tasklib/task.py
---