trillek-team/trillek-client-core — pull request #29 by adam4813 (2014-08-12 03:22:14+00:00)
Title: Develop

Trying to get this inline with the latest we have downstream.