commit eec1097131310669a00573cd9ee6f3738bd3477b Merge: 16cef5e 6012945 Author: David Fifield david@bamsoftware.com Date: Thu May 8 14:11:25 2014 -0700

Merge remote-tracking branch 'changlan/chrome'

chrome/app/background.js | 42 +++++++++++++++++++++++----------------- chrome/extension/background.js | 18 ++++++++++------- 2 files changed, 35 insertions(+), 25 deletions(-)