Merge branch 'refs/heads/t/shadow-fix'
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 21 Aug 2016 19:10:56 +0000 (21:10 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Sun, 21 Aug 2016 19:10:56 +0000 (21:10 +0200)
started 6 weeks ago, cooking for two weeks.

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


Trivial merge