Merge branch 'master' into 3.2 3.2.2
authorAndreas Monzner <andreas.monzner@dream-property.net>
Tue, 27 Mar 2012 08:54:51 +0000 (10:54 +0200)
committerAndreas Monzner <andreas.monzner@dream-property.net>
Tue, 27 Mar 2012 08:54:51 +0000 (10:54 +0200)
commit6aa4a99f808164402d53a68c2f1320f8b77b54ef
treec8a57a42edffd252dd49c42e5a1d8db94d893d81
parent2084bf358ec28ed1e28788c0e8a2d31fcd26a385
parentd91a7fb4f84c96560edfa03fa1508b51c98edb06
Merge branch 'master' into 3.2