Merge branch 'master' of github.com:Yangqing/caffeine
authorYangqing Jia <jiayq84@gmail.com>
Wed, 30 Oct 2013 18:20:51 +0000 (11:20 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Wed, 30 Oct 2013 18:20:51 +0000 (11:20 -0700)
commit22da2e045a220ede2a937254f19cd1da0fd8fc98
treed800e7e8882c1bdd3fc58736e5e15eda8511fecd
parent3e69c314924381a56c0d809351495a5e8add1e5e
parent5a717b4436bb42976f072ebcda7570c99d5aad57
Merge branch 'master' of github.com:Yangqing/caffeine