Merge branch 'devel'
Conflicts: README.md
.gitignore
0 → 100644
.gitmodules
0 → 100644
.mailmap
0 → 100644
.travis.yml
0 → 100644
.travis/build
0 → 100755
AUTHORS
0 → 100644
CMakeLists.txt
0 → 100644
COPYING.LESSER
0 → 100644
ChangeLog
0 → 100755