Merge remote-tracking branch 'schwerkraft/master'
authorAndreas Monzner <andreas.monzner@dream-property.net>
Fri, 5 Sep 2014 15:17:32 +0000 (17:17 +0200)
committerAndreas Monzner <andreas.monzner@dream-property.net>
Fri, 5 Sep 2014 15:17:32 +0000 (17:17 +0200)
commit18b798e564b704a7eb4eaa04ed3acc70e222e052
tree04c106167f92b06d7e3cb273c498b2d1f8132b7f
parent2b5c977efc4dc959d7e828f114142069182b4137
parent0b87dc4fd22bdb1f532c57f0d34d93ca9430db87
Merge remote-tracking branch 'schwerkraft/master'