From: Mike Jerris <mike@jerris.com>
Date: Wed, 13 Aug 2014 18:37:17 +0000 (-0500)
Subject: Merge pull request #25 in FS/freeswitch from ~STEVEAYRE/freeswitch:master to master
X-Git-Tag: v1.4.8~5^2~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5eb01b519ed03d2c011e6f0dcb97fcf3b1114118;p=thirdparty%2Ffreeswitch.git

Merge pull request #25 in FS/freeswitch from ~STEVEAYRE/freeswitch:master to master

* commit '05ef18948d3870c4afcd82ce32e164e4a152a8e1':
  add uptime api to mod_commands
---

5eb01b519ed03d2c011e6f0dcb97fcf3b1114118