[sr-dev] git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

[Peter Dunkley]

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

Author: pd <peter.dunkley at crocodile-rcs.com>
Committer: pd <peter.dunkley at crocodile-rcs.com>
Date:   Mon Jan 30 11:13:55 2012 +0000

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

* 'master' of ssh://git.sip-router.org/sip-router:
  Makefile: merged options for gcc 4.5 and 4.6 in 4.5+
  Makefile: skip mtune parameter for gcc 4.6 on x86_64

---