Chris Corbyn 1b5bf6e12a Merge remote-tracking branch 'upstream/master' into feature/auto_start ... Signed-off-by: Chris Corbyn <chris@w3style.co.uk> Conflicts: tests/fixtures/simple-figfile/fig.yml tests/unit/project_test.py		2014-06-12 22:05:51 +00:00
..
fig.yml	Merge remote-tracking branch 'upstream/master' into feature/auto_start	2014-06-12 22:05:51 +00:00