Merge branch 'issue-2232'
commit14fd6886c988fd9c2d38f20857ad02ece94167b0
authorSven Strickroth <email@cs-ware.de>
Sun, 28 Jun 2015 14:00:22 +0000 (28 16:00 +0200)
committerSven Strickroth <email@cs-ware.de>
Sun, 28 Jun 2015 14:00:22 +0000 (28 16:00 +0200)
treed137655c65564f6bf7aa225574751f84fee0e60d
parentc9725ae3fe8e10dc4234e6b6247203355097a7fa
parent499b2ba7a479a8b6aeb2c23d9aea43e5747695af
Merge branch 'issue-2232'