add changelog entries for merge
authorChristian Weiske <cweiske@cweiske.de>
Wed, 22 Aug 2012 19:46:22 +0000 (21:46 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Wed, 22 Aug 2012 19:46:22 +0000 (21:46 +0200)
commit107e3c1519834ed69936a533df4c4a0d59c8bd14
treea52ee5070d0e50c380a9b7c7d000c08f02d27920
parentc1ab5bf5ad85fee72dca6c6cea3bffef3003a1cb
add changelog entries for merge
ChangeLog