Merge branch 'master' of github.com:Yangqing/caffeine
authorYangqing Jia <jiayq84@gmail.com>
Tue, 15 Oct 2013 20:47:27 +0000 (13:47 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Tue, 15 Oct 2013 20:47:27 +0000 (13:47 -0700)
commit7b49a585b8273b3d37c3ca3286612dfed697d34a
tree64e3649f0d9ca3bd56baffcbe69bbf7499f88591
parent5b2ccef1ab7b890d3f8dba2ffd2e1b06c7dbff92
parentfdb92cb8df63791a7b12405dfbbbaf46b132d76c
Merge branch 'master' of github.com:Yangqing/caffeine