tree c26c00140a6ee1cefcdfd5856f9ba218ff54ef3e
parent a3fa6afb17b384e64ebc44c19f77d3b4c8ec083d
parent 4743109cfe4413fe7c73b97af5a42593a1d8491c
author Pei Li <lpgdsxyz@gmail.com> 1386896584 -0800
committer Pei Li <lpgdsxyz@gmail.com> 1386896584 -0800

Merge branch 'master' into peili/crash_recovery_tests