[sr-dev] git:master: git failed to do fast forward and rebase to avoid the merge notification

[Daniel-Constantin Mierla]

Module: sip-router
Branch: master
Commit: 19ceb74638b7e53fbe6d01a7b51ac07470738d42
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19ceb74638b7e53fbe6d01a7b51ac07470738d42

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Fri Sep 12 20:44:08 2014 +0200

git failed to do fast forward and rebase to avoid the merge notification

Merge branch 'master' of ssh://git.sip-router.org/kamailio

* 'master' of ssh://git.sip-router.org/kamailio:
  Rollback accidental changes from commit (74f53b7d7f6ff00144152aff453e6b388447320c)
  pkg/kamailio/deb: update to 4.2.0~pre0

---