.#21

Merged

huangpf merged 2 commits intohuangpf:devfrom

Jun 10, 2015

Commits on Jun 9, 2015

Remove unneccessary code when getting a resource
vivsriaus
committed

Commits on Jun 10, 2015

Merge pull request #481 from vivsriaus/dev
ogail
committed