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)
commit881fc08f926de82faba65cb58b0505bb402fc58b
treede2945ee32cfcaed1a7f70ca320328762e67a9ce
parent84236f82eed755e98890ad1e6d607192010a0dea
parent57f5b27bb307c13398dd980b88433b7d3cf158e3
Merge remote-tracking branch 'origin/maintain/2.0' into dev/windows