Merge pull request #392 from xor-gate/travis
authortexane <texane@gmail.com>
Thu, 7 Apr 2016 10:20:44 +0000 (12:20 +0200)
committertexane <texane@gmail.com>
Thu, 7 Apr 2016 10:20:44 +0000 (12:20 +0200)
travis: Initial continues integration build on linux and osx


Trivial merge