Merge branch 'master' into gnutls
authorFelix Morgner <felix.morgner@gmail.com>
Thu, 24 Apr 2014 12:17:32 +0000 (14:17 +0200)
committerFelix Morgner <felix.morgner@gmail.com>
Thu, 24 Apr 2014 12:17:32 +0000 (14:17 +0200)

Trivial merge