merge with master
-rwxr-xr-x 39 AUTHORS
-rwxr-xr-x 4016 CMakeLists.txt
-rwxr-xr-x 27118 COPYING
-rwxr-xr-x 11462 LICENSE.APLv2
-rwxr-xr-x 10823 LICENSE.Flora
-rwxr-xr-x 519 NOTICE
-rwxr-xr-x 190 cryptsvc.pc.in
drwxr-xr-x - debian
drwxr-xr-x - include
drwxr-xr-x - libs
drwxr-xr-x - packaging
drwxr-xr-x - srcs