Merge branch 'manual-rework'
commit28a3e5b2e188f786c1f83d84bd169ef7fbcbaa1e
authorSven Strickroth <email@cs-ware.de>
Tue, 31 Jan 2017 17:32:42 +0000 (31 18:32 +0100)
committerSven Strickroth <email@cs-ware.de>
Tue, 31 Jan 2017 17:34:15 +0000 (31 18:34 +0100)
tree226ac986f25a3116ae51267e96c157afae3af6ba
parente8b4ac81b3f5a37d23f8a7bae83a80aaaf671646
parenta742103794b6721094516e7cae33e128ec91edfd
Merge branch 'manual-rework'

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