usmanhalalit/charisma — pull request #33 by wl-pro (2013-07-02 06:42:04+00:00)
Title: update master

update master