From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 21 Aug 2016 19:10:56 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/shadow-fix'
X-Git-Tag: v0.1.7~12
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=41c5e79dcdd912777b7e235b6e9d238a066a21d0

Merge branch 'refs/heads/t/shadow-fix'

started 6 weeks ago, cooking for two weeks.

* refs/heads/t/shadow-fix:
  dss: Do not shadow a global declaration.
---

41c5e79dcdd912777b7e235b6e9d238a066a21d0