Merge branch 'master' into develop
authorjenkins <jenkins@160.45.63.201>
Wed, 15 Jul 2015 09:39:02 +0000 (11:39 +0200)
committerjenkins <jenkins@160.45.63.201>
Wed, 15 Jul 2015 09:39:02 +0000 (11:39 +0200)
commit36a92ea637cdfe123c07c8ef9a219481898bf640
treeb5c6a5732252de578b8e8da88bb3cce10b884e2d
parent05cb19c85195c0217896d55b52bf8f726cbcc88f
parent28ccee0de74d22b145ac3322e45fd074175f9f44
Merge branch 'master' into develop