Merge branch 'renames-for-release'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Sat, 28 Jul 2012 16:15:12 +0000 (18:15 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Sat, 28 Jul 2012 16:15:12 +0000 (18:15 +0200)
commit33e27edfe5bc48502215d2fc4a39916df97717c6
tree2c51e2528089fc7b1774960b75cd1e8756dba4a3
parentb0a504597b70c3702742a816e6bf1fcc7cfc6d53
parent3918b866d692b5592ac6f6c9903dab5d03c184f1
Merge branch 'renames-for-release'