tree b1198e3d91a0a8402f925909e220548140e54dff
parent a693483ee90abc9d055debb65a138435e547f9c6
parent 1aa4dfa55ba953976bb1c32fd63b6e69e7048d2a
author Piotr Krysik <ptrkrysik@gmail.com> 1468584595 +0200
committer Piotr Krysik <ptrkrysik@gmail.com> 1468584595 +0200

Merge branch 'packaging_piotr' into development

# Conflicts:
#	.travis.yml
#	python/CMakeLists.txt