Merge topic 'ASTERISK-25027'
authorMatt Jordan <mjordan@digium.com>
Wed, 29 Apr 2015 14:49:43 +0000 (09:49 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 29 Apr 2015 14:49:43 +0000 (09:49 -0500)
commitd6ecbbac0a731fa19f8ee9a80c8709f2bf3cc4c0
tree27474d8a1f3b522ba1fcb6428b2c0cff43c17864
parentf6202f5cf022a1b7f40d6ca77f1d015429b3df96
parent881844297aae505e86081814be74341000c39666
Merge topic 'ASTERISK-25027'

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