Merge branch 'issue-1330'
commit9fb5ff761faa8b362f886e77246dd4993ebda3c0
authorSven Strickroth <email@cs-ware.de>
Sat, 10 Nov 2012 23:39:00 +0000 (11 00:39 +0100)
committerSven Strickroth <email@cs-ware.de>
Sat, 10 Nov 2012 23:39:00 +0000 (11 00:39 +0100)
tree88580d496d7e37318954220217ef52f2dbe351f2
parentd50396a25ed24d6be1e56e84be5015bcf10f74d3
parent96432578952ec11d92e1d5a0a30de26f98f778bd
Merge branch 'issue-1330'

(fixes issue #1330)

Signed-off-by: Sven Strickroth <email@cs-ware.de>