Merge branch 'trustlink'
authorW. Trevor King <wking@tremily.us>
Sat, 18 Jan 2014 19:58:49 +0000 (11:58 -0800)
committerW. Trevor King <wking@tremily.us>
Sat, 18 Jan 2014 19:58:49 +0000 (11:58 -0800)
commitb472e72df2f0f830e6f36fd090b1ea9cb339b3a8
tree5319befc10eeddc9838bd17329d2c2a094b9d4d5
parent524783d2cd8662f577d4665041f98b22849f8db3
parent137386d12cac825f9592db42c9996eebb88f9398
Merge branch 'trustlink'

* trustlink:
  CHANGELOG: Document this branch
  config and feed: Added trust-link preference

Signed-off-by: W. Trevor King <wking@tremily.us>
CHANGELOG
README