usmanhalalit/charisma — pull request #32 by wl-pro (2013-07-02 06:38:20+00:00)
Title: update master

update master