Merge branch 'issue-1497'
commit1ac02dd4bcda35b69d33dda90e0d9614938efdb9
authorSven Strickroth <email@cs-ware.de>
Sat, 10 Nov 2012 20:55:28 +0000 (10 21:55 +0100)
committerSven Strickroth <email@cs-ware.de>
Sat, 10 Nov 2012 20:55:28 +0000 (10 21:55 +0100)
tree5eca554dbd2979025223f936bdede9eaca299fa0
parent8271ae6fb9313acbebef881582ccaf49aaf9e20d
parent21e87b6c48107ae34c9e5a571204325fcd9fd3fb
Merge branch 'issue-1497'

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