Merge branch 'issue-1086'
commitfe1c9f0e83547bc57ca1bea76f83e69cab8a331c
authorSven Strickroth <email@cs-ware.de>
Fri, 22 Jun 2012 22:01:45 +0000 (23 00:01 +0200)
committerSven Strickroth <email@cs-ware.de>
Fri, 22 Jun 2012 22:01:45 +0000 (23 00:01 +0200)
tree40b8f01d05468a9a6f7cd50680bdcf3eb807d3d2
parentbafda6829cb8b1edb56662fdaa5e05eafd9eabb2
parent69a125cdaf4ef2b71791aee3e66d231dc93bd9d3
Merge branch 'issue-1086'