tree 8a0a43fe404f06568e2d0fb285655a39344b7a4f
parent cefdac77f213a051eb93f4ae48e699fe53739bf8
parent aa4e81b63ca110eb115da3c4e1a7a1da0ee2efa9
author Niels Baggesen <nba@users.sourceforge.net> 1409554780 +0200
committer Niels Baggesen <nba@users.sourceforge.net> 1409554780 +0200

Merge branch 'V5-5-patches' into V5-6-patches

* V5-5-patches:
  Fix commit 7f4a7b891332899cea26e95be0337aae01648742: dont mix code and declarations.