Merge branch 'master' into gnutls
authorFelix Morgner <felix.morgner@gmail.com>
Tue, 22 Apr 2014 09:16:20 +0000 (11:16 +0200)
committerFelix Morgner <felix.morgner@gmail.com>
Tue, 22 Apr 2014 09:16:20 +0000 (11:16 +0200)

Trivial merge