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)
commitf6d844d1999080359046790022dc820cb247cc23
tree14087acfaf4e362975cfeff78126bcd31fac54e4
parent699c9895b10329eeeb6054a24fbf20e3a07a8876
parent381d2562857640505719ed896b0952fc625ccf1e
Merge branch 'master' into gnutls