Commit 4a125b1c authored by jay's avatar jay
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	.gitignore
#	docs/conf.py
parents a5f9de9c bff412b4

There are no changes