tree 875cbbdfd9a26d46a8efc3ad7442f3e3fe34bc8e
parent 021dea6e6832deb33bcdfbd35c606e2a288e9019
parent 698916c012fa3db72408f9eae95ffacc6310acd5
author salsubaiee <salsubaiee@gmail.com> 1377200256 -0700
committer salsubaiee <salsubaiee@gmail.com> 1377200256 -0700

Merge branch 'master' into kisskys_salsubaiee/storage_log_manager_fixes