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

[Olle E. Johansson]

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

Author: Olle E. Johansson <oej at edvina.net>
Committer: Olle E. Johansson <oej at edvina.net>
Date:   Sun Dec  2 21:27:22 2012 +0100

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

* 'master' of ssh://git.sip-router.org/sip-router:
  xcap_server: fix cross-compilation
  regex: fix cross-compilation
  pua_xmpp: fix cross-compilation
  pua_usrloc: fix cross-compilation
  pua_reginfo: fix cross-compilation
  pua_dialoginfo: fix cross-compilation
  pua_bla: fix cross-compilation
  pua: fix cross-compilation
  presence_xml: fix cross-compilation
  presence_reginfo: no need to link against libxml2

---