Merge branch 'master' into wcfDialog/loading
authorMagnus Kühn <magnus.khn@gmail.com>
Sun, 30 Dec 2012 07:41:36 +0000 (08:41 +0100)
committerMagnus Kühn <magnus.khn@gmail.com>
Sun, 30 Dec 2012 07:41:36 +0000 (08:41 +0100)
commitb76cad80678c91902b89b6f7e27008d7d2d99cc1
treeb85688d4e3438f565488f8b1b17091a0af039374
parent1d080f86a1128d3fd3b443ef8789212f5be1a39f
parentb6169da570805e1cbedda35919515d7134c1eda7
Merge branch 'master' into wcfDialog/loading