Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history 
Conflicts:
	docs/changes.rst
  • Loading branch information
@dstufft
dstufft committed Dec 23, 2014
2 parents 0c0d4ce + cd3b9c9 commit 58c6ded
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 58c6ded

Please sign in to comment.