Merge branch 'master' into 3.2
authorAndreas Monzner <andreas.monzner@dream-property.net>
Wed, 21 Mar 2012 17:52:05 +0000 (18:52 +0100)
committerAndreas Monzner <andreas.monzner@dream-property.net>
Wed, 21 Mar 2012 17:52:05 +0000 (18:52 +0100)
commit2084bf358ec28ed1e28788c0e8a2d31fcd26a385
treee2cfaf0576baf17d91cf388375a025bb66e06a37
parentb44e28fb2210052e97e05b6418961a1174609ea0
parentc19b7042d07e7a62be6268e51fca937f2f384699
Merge branch 'master' into 3.2