Merge branch 'tb/upgrade-openssl' into devel
commitcd5a548c95e652470d758bf13311210339288593
authorErik Faye-Lund <kusmabite@gmail.com>
Fri, 8 Apr 2011 12:50:10 +0000 (8 14:50 +0200)
committerErik Faye-Lund <kusmabite@gmail.com>
Fri, 8 Apr 2011 12:50:10 +0000 (8 14:50 +0200)
tree4ea4dea58030fcce775765b8e3c069be4998d618
parenta45f9aba4350042af51c28e9dcbf18a06baee7d2
parent6f88a4308416b421c2951f74c18ab2b1358f079b
Merge branch 'tb/upgrade-openssl' into devel