Merge branch 'devel-2.4' into stable-2.5
authorMichael Hanselmann <hansmi@google.com>
Wed, 11 Apr 2012 18:26:35 +0000 (20:26 +0200)
committerMichael Hanselmann <hansmi@google.com>
Wed, 11 Apr 2012 18:26:39 +0000 (20:26 +0200)
commit6cd4e775f0f8ec325367ba8241c06a9432ad83d9
tree9db36d23c1783e8219a19a0d3c5766cf65f0c41c
parente2e8af735511fa53f669a52323aacc6f8ccdb214
parent612f7fd49992ab39a5ca2225002f5efbb710e30c
Merge branch 'devel-2.4' into stable-2.5

* devel-2.4:
  Fix extra whitespace
  Further fixes concerning drbd port release
  Fix a bug concerning TCP port release

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
lib/cmdlib.py