Merge branch 'master' into master_internal
authorAndreas Monzner <andreas.monzner@dream-property.net>
Fri, 2 Aug 2013 10:29:14 +0000 (12:29 +0200)
committerAndreas Monzner <andreas.monzner@dream-property.net>
Fri, 2 Aug 2013 10:29:14 +0000 (12:29 +0200)
commit79e6aff8166ea028212199faa276e16e8ec56e44
tree03de998965ffd53550bf56bced47e772cdf9ee68
parentb49e18a27546281f50635fbc0ec781385e26567e
parentdcff9aa2fcdc9e31e3abf322ecde0b972cd9d6db
Merge branch 'master' into master_internal