Merge branch 'restification'

Conflicts:
	.gitignore
	CONTRIBUTING.rst
This commit is contained in:
James Kasten
2015-03-21 14:03:36 -07:00
3 changed files with 10 additions and 29 deletions
+1
View File
@@ -8,3 +8,4 @@ venv/
m3
*~
.vagrant
*.swp