tree af03412a0c5d5662e7f6feeaf28a1191eeca9144
parent b72b4edec1f742a42962e25cda9414d2d15b471a
author Paul Bakker <p.j.bakker@polarssl.org> 1378980052 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> 1379139355 +0200

Added merged functionality to ChangeLog