Merge branch 'issue-1860'
commit4756cccaac59037116b0909054f38c83bfde52bc
authorSven Strickroth <email@cs-ware.de>
Sun, 5 Jan 2014 11:56:07 +0000 (5 12:56 +0100)
committerSven Strickroth <email@cs-ware.de>
Sun, 5 Jan 2014 11:56:07 +0000 (5 12:56 +0100)
treec7e5258cd297c7cd496ee98dae5e7ae6c4945b27
parentc1d370f5300d0d1e0e3aa50b34469a48ccda9f5f
parent4e84e02027c7b9d2ff8df0b0443af799ec7c6183
Merge branch 'issue-1860'