[Merge] lp:~thomas-voss/trust-store/add-trust-stored into lp:trust-store

[Marcus Tomlinson]

Review: Needs Fixing

This isn't part of this diff but I noticed something strange:

In trust_store_test.cpp on line 98 you assign r2.feature.value, then on line 101 you assign it again? Was line 101 supposed to assign r3?

Another general note:

I notice there are .cpp and .h files under the src/ directory. Shouldn’t your .h files live under /include?
-- 
https://code.launchpad.net/~thomas-voss/trust-store/add-trust-stored/+merge/227685
Your team Ubuntu Phablet Team is subscribed to branch lp:trust-store.