manual merge of tripzero/master
authorKevron Rees <kevron.m.rees@intel.com>
Sat, 31 Jan 2015 00:28:51 +0000 (16:28 -0800)
committerKevron Rees <kevron.m.rees@intel.com>
Sat, 31 Jan 2015 00:28:51 +0000 (16:28 -0800)
commit61d66419b49ba34b6ab369c62fda41519a7f67e5
tree75039064f8bf3dd460a31d55f8ea8883d4ff4bbf
parente4b354ccc9e520dd1870d38d5301258bdae59971
parent41676f98fc3ee29b9fa4e36edd70010716551c9d
manual merge of tripzero/master
plugins/common/dbusplugin.cpp