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)

Trivial merge