Merge remote-tracking branch 'origin/variant_dev' into variant_dev
authorJohannes Schanda <schanda@itestra.de>
Wed, 16 Jan 2013 14:08:18 +0000 (15:08 +0100)
committerJohannes Schanda <schanda@itestra.de>
Wed, 16 Jan 2013 14:08:18 +0000 (15:08 +0100)
commit8e8ff3fbd5479c59afe026cf71c9ba844beeafa5
tree6475b1436bab412cabc884fc8502434690361bf2
parentc2b595737983552ea2b192de51e199dcd1f355b8
parent23359ca76063f3a5ddff1771edd4de3c05fede8c
Merge remote-tracking branch 'origin/variant_dev' into variant_dev