merge from devel

This commit is contained in:
denise 2012-12-03 11:06:56 -05:00
parent 2f0c6b702a
commit b2699fa914
17 changed files with 143 additions and 84 deletions

View file

@ -15,7 +15,7 @@ import json
import base64
from configobj import ConfigObj
AIRTIME_VERSION = "2.2.0"
AIRTIME_VERSION = "2.2.1"
# TODO : Place these functions in some common module. Right now, media