Merge remote-tracking branch 'origin/dev'
authorMaximilian Quellmalz <maximilian.quellmalz@mailbox.tu-dresden.de>
Tue, 12 Aug 2014 13:58:18 +0000 (15:58 +0200)
committerMaximilian Quellmalz <maximilian.quellmalz@mailbox.tu-dresden.de>
Tue, 12 Aug 2014 13:58:18 +0000 (15:58 +0200)
commitaa25679282b79780936fc2dd9133ccd74e604224
treec8111e555019e030e6fb1e595a7e88ddb2d6c986
parentc570b750c190cfe553acc2e05576b2c86a2f1a18
parentbdda7b82641c5fb894b6ba64c224682fd99e0282
Merge remote-tracking branch 'origin/dev'