[OpenSIPS-Devel] [OpenSIPS/opensips] 4389c2: [siptrace] fix bad cherry-pick conflict solving

[ionutrazvanionita]

  Branch: refs/heads/2.2
  Home:   https://github.com/OpenSIPS/opensips
  Commit: 4389c264f538b8bdf527b86ba9addbe97f4296d5
      https://github.com/OpenSIPS/opensips/commit/4389c264f538b8bdf527b86ba9addbe97f4296d5
  Author: ionutrazvanionita <ionutionita at opensips.org>
  Date:   2016-05-03 (Tue, 03 May 2016)

  Changed paths:
    M modules/siptrace/siptrace.c

  Log Message:
  -----------
  [siptrace] fix bad cherry-pick conflict solving