Merge branch 'master'
commit788a76482cd8df08c7412039ba63cc3d6219beac
authorSven Strickroth <email@cs-ware.de>
Mon, 21 May 2012 20:54:09 +0000 (21 22:54 +0200)
committerSven Strickroth <email@cs-ware.de>
Mon, 21 May 2012 20:54:09 +0000 (21 22:54 +0200)
tree628e16bee9731c6f54c5982c3ea055cbfa9a73a2
parent95f3da655a56a690aad28ceb4c780de82d6a6bd5
parentc23a0b08f7b46a1888d959f36ac2287882f06075
Merge branch 'master'

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Changelog.txt