2013/1/12
Merge branch 'master' of https://github.com/channeldeveloper/channel.git