Commit c7fc93d002e18ebd684439922b5f5411ca9b20fa

Steffen Jaeckel 2013-11-24T15:38:19

Merge branch 'lomereiter/master' into develop