From: Matt Jordan <mjordan@digium.com>
Date: Wed, 29 Apr 2015 14:49:43 +0000 (-0500)
Subject: Merge topic 'ASTERISK-25027'
X-Git-Tag: 14.0.0-beta1~1020
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6ecbbac0a731fa19f8ee9a80c8709f2bf3cc4c0;p=thirdparty%2Fasterisk.git

Merge topic 'ASTERISK-25027'

* changes:
  res_pjsip: Remove incorrect MODULEINFO from presence_xml.c.
  Git Migration: Create doc/rest-api when needed.
---

d6ecbbac0a731fa19f8ee9a80c8709f2bf3cc4c0