Merge remote-tracking branch 'origin/maintain/2.0' into dev/windows
authorStefan Laner <laner@itestra.de>
Fri, 20 Dec 2013 15:08:54 +0000 (16:08 +0100)
committerStefan Laner <laner@itestra.de>
Fri, 20 Dec 2013 15:08:54 +0000 (16:08 +0100)

Trivial merge