Merge branch 'master' into master_internal
authorAndreas Monzner <andreas.monzner@dream-property.net>
Thu, 17 Jul 2014 10:19:53 +0000 (12:19 +0200)
committerAndreas Monzner <andreas.monzner@dream-property.net>
Thu, 17 Jul 2014 10:19:53 +0000 (12:19 +0200)
commit6d19bbb4f0a3a1849f64ad0de45dd0e4c3b4c26d
tree5028a131fe1b11cabc23ee89af9e5f98d4e4c475
parentb8f096032b602f3cf3dfd0f86fd6909b33bd1aad
parent5ef12cc93a02794e2389ab0adfd67280fd7e0224
Merge branch 'master' into master_internal