branch updates


Just a quick update about the current branch on upstream:

- master : where 2.1 will be cut from. This is open for new features.
- 2.0.x : where 2.0.1 will be cut from. Only bug-fixes should be
merged/backported. If in doubt, ask!
- 2.0.0-doc : can be used to rebuild the documentation. Only changes to
the rst or examples can be merged/backported to this branch.

The 2.x branch has been deleted from upstream. To make sure you do not
have stale references to this around please run

   git remote update --prune

to delete your local references. It is strongly suggested to delete your
2.x branches (both on your local machines and on your personal github

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <>