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)
commitce0029a0c689d9b96d6a797a2e46aa0bee712e36
treee22bbbae0a2e6d491793b6f84abe1baea9c869f4
parentd2aea1784608f6723e0296d0c663669f02603a05
parent4e888c2117d35b588466f46faaef99df01ba94fe
Merge branch 'master' into gnutls