Merge branch 'master' of github.com:Yangqing/caffeine
authorYangqing Jia <jiayq84@gmail.com>
Thu, 7 Nov 2013 19:29:22 +0000 (11:29 -0800)
committerYangqing Jia <jiayq84@gmail.com>
Thu, 7 Nov 2013 19:29:22 +0000 (11:29 -0800)
commit8e9916ad0d007d93104485e203e1bcb238ffda29
tree741ef90fb80062e75a6bfac6864587caa630c59e
parentade9664cba38b2e03b708db421723dfbc07e159b
parenta48147c1b8467330adcdb5fe5523831e4ebb8950
Merge branch 'master' of github.com:Yangqing/caffeine