parent: caf658 | patch | commitdiff
Steve Piercy
2016-04-15 642940cd29203e2e271f72dc866943f447d707e4
refs
author Steve Piercy <web@stevepiercy.com>
Friday, April 15, 2016 08:10 +0200
committer Steve Piercy <web@stevepiercy.com>
Friday, April 15, 2016 08:10 +0200
commit642940cd29203e2e271f72dc866943f447d707e4
tree 4441f87f10771e527ece86ee65103087836d6f73 tree | zip | gz
parent caf65803b79fb05a570af39e5ed90bed7e51e942 view | diff
3fc6e7fb89c2fcece39f448fd4e3a2c0c54b8439 view | diff 
Merge remote-tracking branch 'upstream/master'

Conflicts:
	docs/whatsnew-1.7.rst
2 files modified
427 ■■■■■ changed files
HISTORY.txt 415 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.7.rst 12 ●●●●● diff | view | raw | blame | history