tree e72d7455a90dc3c7027f25740c026cd20102fb61
parent 981732bb8ef71244957d735f05b40710a740a050
parent 4ed5df8a06d6d863cf9d54a13a687cb196d7d2c9
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1424188339 +0000
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1424188339 +0000

Merge remote-tracking branch 'public/development' into development

* public/development:
  Remove gnutls from the travis build
  Fix soname mistake