Merge branch 'issue-974'
commit28db8b8c642272c03122ee3627bb32dc5b1bee2d
authorSven Strickroth <email@cs-ware.de>
Fri, 18 Nov 2011 20:05:41 +0000 (18 21:05 +0100)
committerSven Strickroth <email@cs-ware.de>
Fri, 18 Nov 2011 20:05:41 +0000 (18 21:05 +0100)
tree50621c8c1e67f02bed57fd2726aac37ae9ec3a32
parent6a8f3df97e12c11ae7c48372afae06913ce4f810
parentf928f8c8bd6d4c6a9e4307de9485f746795f7f80
Merge branch 'issue-974'

(fixes issue #974)