tree c7216d9d3072d137f95dddda1f10cca74c748d91
parent 7e596fe267db33bd5afb5b82b32f57ad939c117d
parent 0034581deb3e676d328824c87637aaca31850c6a
author Niels Baggesen <nba@users.sourceforge.net> 1404159228 +0200
committer Niels Baggesen <nba@users.sourceforge.net> 1404159228 +0200

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

* V5-4-patches:
  BUG #a2551: fix non-sequential cpu numbers on HP-UX. Thanks to Dave Olker.