tree cfdce5f51eae173afc4b649068ab1b79b5d43290
parent acf247aa86edcf2f41f248d3f15532ada5ff8f10
parent 3da0c378b5cb1bbf35d05a6212a483abda84a201
author Niels Baggesen <nba@users.sourceforge.net> 1409554779 +0200
committer Niels Baggesen <nba@users.sourceforge.net> 1409554779 +0200

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

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