Merge branch 'master' of github.com:otcshare/GhostCluster into upstream
authorKevron Rees <kevron_m_rees@linux.intel.com>
Tue, 4 Dec 2012 20:53:12 +0000 (12:53 -0800)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Tue, 4 Dec 2012 20:53:12 +0000 (12:53 -0800)
commitde06c35fd19d40c8c099b85c8d496a7dcf0cf64d
treefd18d4f2151a21e978be29787e5bf1e0613928d7
parentecf0b1c8c08bb33bc199ae580a1b4f762c418f0c
parent33ac3831d0e1ebb694c4f6494424c80782d7c131
Merge branch 'master' of github.com:otcshare/GhostCluster into upstream