[OpenSIPS-Devel] [OpenSIPS/opensips] da6513: dispatcher: fix merging bug

[Liviu Chircu]

  Branch: refs/heads/1.8
  Home:   https://github.com/OpenSIPS/opensips
  Commit: da651378aa42ffb55caf6a4a3ce8633996d7c6c2
      https://github.com/OpenSIPS/opensips/commit/da651378aa42ffb55caf6a4a3ce8633996d7c6c2
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M modules/dispatcher/dispatch.c

  Log Message:
  -----------
  dispatcher: fix merging bug

Commit 4cb026c83 actually made Round-Robin dispatching behave
incorrectly should one or more destinations be down

(cherry picked from commit 85ffd49dca80e2dcd89ac61f096cd20f13a1229f)

Conflicts:
	modules/dispatcher/dispatch.c

(cherry picked from commit 374f68834a22a14a002889a7696f2c60d3734077)

Conflicts:
	modules/dispatcher/dispatch.c