From: Benjamin Auder <benjamin.auder@somewhere>
Date: Fri, 22 Jul 2016 15:14:04 +0000 (+0200)
Subject: after merging
X-Git-Url: https://git.auder.net/?a=commitdiff_plain;h=5e8537e80ba92f2eab61e2b573ef3a9328d37349;hp=5e8537e80ba92f2eab61e2b573ef3a9328d37349;p=sview.git

after merging
---