tree 65d413c0e9403e4aa3928b093eb8122a9fa0d310
parent 0837b21e798a9856c0a9f438ec44a83bed1f8536
parent aed57234aeb79ffdc80c7cc8a61fc92b72aa7709
author Niels Baggesen <nba@users.sourceforge.net> 1409554782 +0200
committer Niels Baggesen <nba@users.sourceforge.net> 1409554782 +0200

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

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