tree 100a63efde11ac173748fbcc0fb2a987ccf6d848
parent df5069cb97f5381fdce4f44949f400db9a5e7d9f
parent fb1ba781b398d39f4444515381babcc9e5a8dcd2
author Paul Bakker <p.j.bakker@polarssl.org> 1353943811 +0100
committer Paul Bakker <p.j.bakker@polarssl.org> 1353943811 +0100

Merge branch 'polarssl-1.2' for release of PolarSSL 1.2.3