Skip to content

Commit

Permalink
Merge branch 'master' into all-pythons
Browse files Browse the repository at this point in the history 
Conflicts:
	.travis.yml
	src/zodbpickle/tests/pickletester_2.py
  • Loading branch information
@tseaver
tseaver committed Apr 2, 2015
2 parents 00aa5a5 + 59399d5 commit c9880c0
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit c9880c0

Please sign in to comment.